[Buildroot] [PATCH 02/10] gitlab-ci: share the image version with the child
Yann E. MORIN
yann.morin.1998 at free.fr
Sun Sep 6 20:12:21 UTC 2020
Currently, the image name and version are duplicated in the main
pipeline and the generated, child pipeline.
This is a condition for a future gaffe, so let's use the image from the
main pipeline when generating the child one.
Signed-off-by: Yann E. MORIN <yann.morin.1998 at free.fr>
Cc: Romain Naour <romain.naour at gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
Cc: Arnout Vandecappelle <arnout at mind.be>
---
support/misc/gitlab-ci.yml.in | 5 -----
support/scripts/generate-gitlab-ci-yml | 14 +++++++++++++-
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in
index 0d058bdd91..f00c764aaf 100644
--- a/support/misc/gitlab-ci.yml.in
+++ b/support/misc/gitlab-ci.yml.in
@@ -1,8 +1,3 @@
-# Configuration for Gitlab-CI.
-# Builds appear on https://gitlab.com/buildroot.org/buildroot/pipelines
-
-image: buildroot/base:20200814.2228
-
.check_base:
rules:
- if: '$CI_COMMIT_REF_NAME =~ /^.*-.*_defconfig$/ || $CI_COMMIT_REF_NAME =~ /^.*-tests\..*$/'
diff --git a/support/scripts/generate-gitlab-ci-yml b/support/scripts/generate-gitlab-ci-yml
index 51f7de21dd..b076b01d05 100755
--- a/support/scripts/generate-gitlab-ci-yml
+++ b/support/scripts/generate-gitlab-ci-yml
@@ -5,7 +5,7 @@ set -o pipefail
main() {
local template="${1}"
- cat "${template}"
+ preamble "${template}"
(
cd configs
@@ -18,4 +18,16 @@ main() {
| LC_ALL=C sort
}
+preamble() {
+ local template="${1}"
+
+ cat - "${template}" <<-_EOF_
+ # This file is generated; do not edit!
+ # Builds appear on https://gitlab.com/buildroot.org/buildroot/pipelines
+
+ image: ${CI_JOB_IMAGE}
+
+_EOF_
+}
+
main "${@}"
--
2.20.1
More information about the buildroot
mailing list