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

Refactoring: do not rename *_PATH variables in build.env

We were using different variable names for the same variable in build
and package stages. Unify these names in order to reduce potential
confusion.
parent 2346bb98
No related branches found
No related tags found
1 merge request!326Refactoring: improve variable naming and definitions
Pipeline #77827 passed with stages
in 1 minute and 58 seconds
......@@ -62,6 +62,14 @@ build-{{ machine }}:
# branch, because we don't always execute the full pipeline on the master branches.
# In those cases the actual build job does not exist, which results in a 404 error.
BUILD_ARTIFACTS: ${BUILD_ARTIFACTS_PREFIX}-{{ machine }}
after_script:
# FIXME: This is necessary because we changed variable naming, but we still use a
# release with the old naming for build simulation. Can be removed as soon as we
# switch to a newer release already containing the new naming scheme.
- source build.env
- echo "IMAGE_PATH=${BUILD_PATH_IMAGE}" >> build.env
- echo "SDK_PATH=${BUILD_PATH_SDK}" >> build.env
- echo "LICENSES_PATH=${BUILD_PATH_LICENSE}" >> build.env
{% endif %}
......
......@@ -113,9 +113,9 @@ workflow:
.save_build_env: &save_build_env
# Artifact paths are needed for packaging
- echo "BUILD_PATH_IMAGE=${IMAGE_PATH}" >> build.env
- echo "BUILD_PATH_SDK=${SDK_PATH}" >> build.env
- echo "BUILD_PATH_LICENSE=${LICENSES_PATH}" >> build.env
- echo "IMAGE_PATH=${IMAGE_PATH}" >> build.env
- echo "SDK_PATH=${SDK_PATH}" >> build.env
- echo "LICENSES_PATH=${LICENSES_PATH}" >> build.env
# Install script location is needed in test job
- echo "FNG_INSTALL_URL=${FNG_INSTALL_URL}" >> build.env
......@@ -303,17 +303,17 @@ workflow:
# We do this manually since we do not use GitLab's default artifact downloader
- source build.env
script:
# BUILD_PATH_* variables are available via build.env from build job
# IMAGE_PATH, SDK_PATH and LICENSES_PATH are available via build.env from build job
- if [[ "${PACKAGE_TYPE}" == "image" ]]; then
- .gitlab-ci/scripts/package_release.py
--images-dir="${BUILD_PATH_IMAGE}"
--licenses-dir="${BUILD_PATH_LICENSE}"
--images-dir="${IMAGE_PATH}"
--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="${BUILD_PATH_SDK}"
--sdk-dir="${SDK_PATH}"
--output-dir=release
--release-suffix="${RELEASE_SUFFIX}"
- fi
......
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