From 6c3a8ff7c2a5e56bdeaf3f2b1fa0c461520e9070 Mon Sep 17 00:00:00 2001
From: Felix Gerking <felix.gerking@garz-fricke.com>
Date: Fri, 1 Apr 2022 13:51:22 +0200
Subject: [PATCH] CI:package_release: Remove "GUF-" prefix from gitlab
artifacts dir
BCS 746-000637
---
alphaplan_fwr.py | 4 +---
package_release.py | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/alphaplan_fwr.py b/alphaplan_fwr.py
index 150dfa28..4e6db229 100755
--- a/alphaplan_fwr.py
+++ b/alphaplan_fwr.py
@@ -304,12 +304,10 @@ def main():
if version.startswith("fngsystem"):
release_name_local = version.replace("fngsystem", "FNGSystem")
- release_name = release_name_local
else:
- release_name = "GUF-Yocto-%s" % version
release_name_local = "Yocto-%s" % version
- output_dir = os.path.join(args.outputdir_upload, release_name)
+ output_dir = os.path.join(args.outputdir_upload, release_name_local)
outlocal_dir = os.path.join(args.outputdir_local, release_name_local)
if not os.path.isdir(outlocal_dir):
sys.exit("ERROR: ouputdir-local does not exist")
diff --git a/package_release.py b/package_release.py
index 79670b91..9e7a414d 100755
--- a/package_release.py
+++ b/package_release.py
@@ -145,16 +145,14 @@ def main():
if version.startswith("fngsystem"):
release_name_local = version.replace("fngsystem", "FNGSystem")
- release_name = release_name_local
# outlocal_base = "/artifacts-fngsystem"
else:
- release_name = "GUF-Yocto-%s" % version
release_name_local = "Yocto-%s" % version
# outlocal_base = "/artifacts-yocto"
# Create output directories
if args.outputdir_upload is not None:
- output_dir = os.path.join(args.outputdir_upload, release_name)
+ output_dir = os.path.join(args.outputdir_upload, release_name_local)
os.makedirs(output_dir, exist_ok=True)
else:
output_dir = None
--
GitLab