Skip to content
Snippets Groups Projects
Commit cad30c20 authored by Tim Jaacks's avatar Tim Jaacks
Browse files

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"
parent 922f49f8
No related branches found
No related tags found
1 merge request!329Add yocto version job
...@@ -345,12 +345,10 @@ workflow: ...@@ -345,12 +345,10 @@ workflow:
--licenses-dir="${LICENSES_PATH}" --licenses-dir="${LICENSES_PATH}"
--doc-dir=. --doc-dir=.
--output-dir=release --output-dir=release
--release-suffix="${RELEASE_SUFFIX}"
- elif [[ "${PACKAGE_TYPE}" == "sdk" ]]; then - elif [[ "${PACKAGE_TYPE}" == "sdk" ]]; then
- .gitlab-ci/scripts/package_release.py - .gitlab-ci/scripts/package_release.py
--sdk-dir="${SDK_PATH}" --sdk-dir="${SDK_PATH}"
--output-dir=release --output-dir=release
--release-suffix="${RELEASE_SUFFIX}"
- fi - fi
cache: cache:
- key: ${CI_PIPELINE_ID}-${ASSOCIATED_BUILD_JOB} - key: ${CI_PIPELINE_ID}-${ASSOCIATED_BUILD_JOB}
......
...@@ -87,11 +87,6 @@ def main(): ...@@ -87,11 +87,6 @@ def main():
action="append", action="append",
required=True, required=True,
) )
parser.add_argument(
"--release-suffix",
help="""Suffix to append to the release folder""",
dest="release_suffix",
)
args, _ = parser.parse_known_args() args, _ = parser.parse_known_args()
# Get bitbake variables from testdata.json file # Get bitbake variables from testdata.json file
...@@ -131,10 +126,6 @@ def main(): ...@@ -131,10 +126,6 @@ def main():
else: else:
release_name = f"Yocto-{version}" 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 # Create output directories
output_dirs = [] output_dirs = []
for output_dir in args.output_dir: for output_dir in args.output_dir:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment