From e136e5e281d3f98b37927ca303f96339606231ff Mon Sep 17 00:00:00 2001
From: Tim Jaacks <tim.jaacks@seco.com>
Date: Fri, 8 Sep 2023 14:36:13 +0200
Subject: [PATCH] Remove top-level "release" folder from package
---
build-pipeline-yocto.yml.jinja2 | 11 ++++++-----
build-pipeline.yml | 8 ++++----
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/build-pipeline-yocto.yml.jinja2 b/build-pipeline-yocto.yml.jinja2
index 92ae00c0..61819600 100644
--- a/build-pipeline-yocto.yml.jinja2
+++ b/build-pipeline-yocto.yml.jinja2
@@ -153,14 +153,14 @@ deploy-{{ machine }}:
stage: Deploy SoftwareStore
variables:
MACHINE: {{ machine }}
- DEPLOY_SOURCE: release/$${RELEASE_NAME}
+ DEPLOY_SOURCE: $${RELEASE_NAME}
DEPLOY_TARGET: ${DEPLOY_RELEASE_TARGET}
DEPLOY_TARGET_LINK: ${DEPLOY_RELEASE_TARGET_LINK}
{% else %}
stage: Deploy SoftwareStore Internal
variables:
MACHINE: {{ machine }}
- DEPLOY_SOURCE: release/$${RELEASE_NAME}
+ DEPLOY_SOURCE: $${RELEASE_NAME}
DEPLOY_TARGET: ${DEPLOY_INTERNAL_RELEASE_TARGET}
DEPLOY_TARGET_LINK: ${DEPLOY_INTERNAL_RELEASE_TARGET_LINK}
{% endif %}
@@ -206,7 +206,7 @@ ftp-{{ machine }}:
- ftp
variables:
MACHINE: {{ machine }}
- DEPLOY_SOURCE: release/$${RELEASE_NAME}
+ DEPLOY_SOURCE: $${RELEASE_NAME}
DEPLOY_TARGET: ${DEPLOY_FTP_TARGET}
DEPLOY_TARGET_LINK: ${DEPLOY_FTP_TARGET_LINK}
ASSOCIATED_PACKAGE_JOB: package-{{ machine }}
@@ -235,14 +235,15 @@ azure-{{ machine }}:
allow_failure: true
variables:
MACHINE: {{ machine }}
- DEPLOY_SOURCE: release
- DEPLOY_TARGET: ${AZURE_TARGET_FOLDER}
+ DEPLOY_SOURCE: $${RELEASE_NAME}
+ DEPLOY_TARGET: ${AZURE_TARGET_FOLDER}/$${RELEASE_NAME}
CONTAINER_NAME: ${AZURE_CONTAINER_NAME}
ASSOCIATED_PACKAGE_JOB: package-{{ machine }}
needs:
- job: package-{{ machine }}
artifacts: false
- job: changelog
+ - job: build-version
{% endif %}
diff --git a/build-pipeline.yml b/build-pipeline.yml
index 53494970..d42f1e58 100644
--- a/build-pipeline.yml
+++ b/build-pipeline.yml
@@ -330,7 +330,7 @@ workflow:
- if: $PACKAGE_TYPE == "sdk"
artifacts:
paths:
- - release/**/**/*
+ - ${RELEASE_NAME}/**/*
timeout: 90m
before_script:
# We do this manually since we do not use GitLab's default artifact downloader
@@ -343,13 +343,13 @@ workflow:
--images-dir="${IMAGE_PATH}"
--licenses-dir="${LICENSES_PATH}"
--doc-dir=.
- --output-dir=release/${RELEASE_NAME}
+ --output-dir=${RELEASE_NAME}
--release-version=${RELEASE_VERSION}
--machine=${MACHINE}
- elif [[ "${PACKAGE_TYPE}" == "sdk" ]]; then
- .gitlab-ci/scripts/package_release.py
--sdk-dir="${SDK_PATH}"
- --output-dir=release/${RELEASE_NAME}
+ --output-dir=${RELEASE_NAME}
--release-version=${RELEASE_VERSION}
--machine=${MACHINE}
- fi
@@ -360,7 +360,7 @@ workflow:
- key: ${CI_PIPELINE_ID}-${CI_JOB_NAME}
policy: push
paths:
- - release
+ - ${RELEASE_NAME}
# --------------------------------------------------------------------------------------
# Stage: deploy
--
GitLab