From 97228cdbbf6717d151ee8f695cf69becf88b0de9 Mon Sep 17 00:00:00 2001
From: Tim Jaacks <tim.jaacks@seco.com>
Date: Mon, 16 Oct 2023 10:44:13 +0200
Subject: [PATCH] Move MACHINE variable from deploy.env to build.env
The Confluence stage is the only stage that needs the MACHINE variable.
Since the collect_release_information script already loads the build.env
from the build jobs, there is no need to store this variable in
deploy.env.
---
build-pipeline.yml | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/build-pipeline.yml b/build-pipeline.yml
index aa7e2b94..451a187c 100644
--- a/build-pipeline.yml
+++ b/build-pipeline.yml
@@ -127,7 +127,8 @@ workflow:
- echo "DISTRO_RELEASE_ARTEFACTS='${DISTRO_RELEASE_ARTEFACTS}'" >> build.env
# Install script location is needed in test job
- echo "FNG_INSTALL_URL=${FNG_INSTALL_URL}" >> build.env
- # Supported hardware is needed for Confluence release page
+ # Machine and supported hardware are needed for Confluence release page
+ - echo "MACHINE=${MACHINE}" >> build.env
- echo "SUPPORTED_HARDWARE='${SUPPORTED_HARDWARE}'" >> build.env
# --------------------------------------------------------------------------------------
@@ -414,10 +415,7 @@ workflow:
- when: manual
allow_failure: true
after_script:
- # Save MACHINE for confluence stage. This variable cannot be passed directly on the
- # job definition level because the confluence stage is machine-independent.
- - echo "MACHINE=${MACHINE}" > deploy.env
- - echo "FILES=\"$(cat files.txt | tr '\n' ' ')\"" >> deploy.env
+ - echo "FILES=\"$(cat files.txt | tr '\n' ' ')\"" > deploy.env
timeout: 60m
cache:
# Get the packaged artifacts from the cache
--
GitLab