From 14dc26ca14d5ba564e9aca2db4c8d25c3534ae7c Mon Sep 17 00:00:00 2001 From: Moritz Lammerich <moritz.lammerich@ost.ch> Date: Mon, 26 Sep 2022 15:21:32 +0200 Subject: [PATCH] try using Gitlab Environments for variable scoping --- .gitlab-ci.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bd5a4c5..7ad9e19 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,6 +43,7 @@ build_cb20: extends: .repo-image rules: !reference [.rules_cb20, rules] stage: image + environment: ${CI_COMMIT_BRANCH} variables: LAYER_PATH: ../layers REPO_BB_CONF_PATH: ./conf @@ -55,6 +56,7 @@ sdk_cb20: extends: .repo-sdk rules: !reference [.rules_cb20, rules] stage: sdk + environment: ${CI_COMMIT_BRANCH} needs: - build_cb20 variables: @@ -69,6 +71,7 @@ esdk_cb20: extends: .repo-esdk rules: !reference [.rules_cb20, rules] stage: esdk + environment: ${CI_COMMIT_BRANCH} needs: - sdk_cb20 variables: @@ -85,6 +88,7 @@ esdk_cb20: build_x86rt: extends: .cooker-image rules: !reference [.rules_x86rt, rules] + environment: ${CI_COMMIT_BRANCH} variables: MACHINE: "x86-rt" @@ -92,6 +96,7 @@ sdk_x86rt: stage: sdk extends: .cooker-sdk rules: !reference [.rules_x86rt, rules] + environment: ${CI_COMMIT_BRANCH} needs: - build_x86rt variables: @@ -101,6 +106,7 @@ esdk_x86rt: stage: esdk extends: .cooker-esdk rules: !reference [.rules_x86rt, rules] + environment: ${CI_COMMIT_BRANCH} needs: - sdk_x86rt variables: @@ -109,6 +115,7 @@ esdk_x86rt: build_bblue: extends: .cooker-image rules: !reference [.rules_bblue, rules] + environment: ${CI_COMMIT_BRANCH} variables: MACHINE: "bblue" @@ -116,6 +123,7 @@ sdk_bblue: stage: sdk extends: .cooker-sdk rules: !reference [.rules_bblue, rules] + environment: ${CI_COMMIT_BRANCH} needs: - build_bblue variables: @@ -125,6 +133,7 @@ esdk_bblue: stage: esdk extends: .cooker-esdk rules: !reference [.rules_bblue, rules] + environment: ${CI_COMMIT_BRANCH} needs: - sdk_bblue variables: @@ -137,6 +146,7 @@ package_x86rt: rules: - if: $CI_COMMIT_TAG dependencies: [build_x86rt,sdk_x86rt,esdk_x86rt] + environment: ${CI_COMMIT_BRANCH} variables: MACHINE: "x86-rt" @@ -147,5 +157,6 @@ package_bblue: rules: - if: $CI_COMMIT_TAG dependencies: [build_bblue,sdk_bblue,esdk_bblue] + environment: ${CI_COMMIT_BRANCH} variables: MACHINE: "bblue" -- GitLab