From 0f5fa96a691d143ddc13d8aacca3940f92b2d8ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20H=C3=B6ppner?= <jonas.hoeppner@garz-fricke.com> Date: Wed, 1 Sep 2021 15:16:34 +0200 Subject: [PATCH] CI: package release: Fix output naming for FNGSystem release The prefix was not correctly set. --- package_release.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/package_release.py b/package_release.py index b7bc824..a40e1d9 100755 --- a/package_release.py +++ b/package_release.py @@ -123,20 +123,18 @@ def main(): artifacts_all = buildvars["DISTRO_RELEASE_ARTEFACTS"].split() artifacts_all.append("BUILD_SRCREVS.log") - # Set directories (use relative path) - release_name = "GUF-Yocto-%s" % version - # output_dir = "%s/%s/%s" % (args.release_dir, release_name, machine) - output_dir = os.path.join(args.release_dir, release_name) - # Create output directory - os.makedirs(output_dir, exist_ok=True) - - # local output ( mount on host machine) - release_name_local = "Yocto-%s" % version 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" - # outlocal_dir = "%s/%s/%s" % (outlocal_base, release_name_local, machine) + + # Create output directories + output_dir = os.path.join(args.release_dir, release_name) + os.makedirs(output_dir, exist_ok=True) outlocal_dir = os.path.join(outlocal_base, release_name_local) os.makedirs(outlocal_dir, exist_ok=True) -- GitLab