From cad30c200f9780f4f6c74dcb9e24d46c0422960b Mon Sep 17 00:00:00 2001
From: Tim Jaacks <tim.jaacks@seco.com>
Date: Thu, 7 Sep 2023 09:30:47 +0200
Subject: [PATCH] Remove RELEASE_SUFFIX variable
The RELEASE_NAME variable can be set directly now, so there's no need to
have a dedicated RELEASE_SUFFIX anymore. A previous configuration like
RELEASE_SUFFIX: "-custom"
can now be achieved using:
RELEASE_NAME: "Yocto-${RELEASE_VERSION}-custom"
---
build-pipeline.yml | 2 --
scripts/package_release.py | 9 ---------
2 files changed, 11 deletions(-)
diff --git a/build-pipeline.yml b/build-pipeline.yml
index 98f20d6c..8aab41bd 100644
--- a/build-pipeline.yml
+++ b/build-pipeline.yml
@@ -345,12 +345,10 @@ workflow:
--licenses-dir="${LICENSES_PATH}"
--doc-dir=.
--output-dir=release
- --release-suffix="${RELEASE_SUFFIX}"
- elif [[ "${PACKAGE_TYPE}" == "sdk" ]]; then
- .gitlab-ci/scripts/package_release.py
--sdk-dir="${SDK_PATH}"
--output-dir=release
- --release-suffix="${RELEASE_SUFFIX}"
- fi
cache:
- key: ${CI_PIPELINE_ID}-${ASSOCIATED_BUILD_JOB}
diff --git a/scripts/package_release.py b/scripts/package_release.py
index eab67640..92bc2b1b 100755
--- a/scripts/package_release.py
+++ b/scripts/package_release.py
@@ -87,11 +87,6 @@ def main():
action="append",
required=True,
)
- parser.add_argument(
- "--release-suffix",
- help="""Suffix to append to the release folder""",
- dest="release_suffix",
- )
args, _ = parser.parse_known_args()
# Get bitbake variables from testdata.json file
@@ -131,10 +126,6 @@ def main():
else:
release_name = f"Yocto-{version}"
- # Append release suffix
- if args.release_suffix is not None:
- release_name = release_name + args.release_suffix
-
# Create output directories
output_dirs = []
for output_dir in args.output_dir:
--
GitLab