From 3e88ad8eace46f5671586c9dc17a4c2ad3ea9cb7 Mon Sep 17 00:00:00 2001
From: Tobias Poganiuch <tobias.poganiuch@garz-fricke.com>
Date: Fri, 13 May 2022 17:39:45 +0200
Subject: [PATCH] buildfng: Moved the image and distro variables to global
The image and distro for the buildfng job can now be set via
global/external variables.
---
manifest.yml | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/manifest.yml b/manifest.yml
index 7bfc8149..7fca5886 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -19,6 +19,13 @@ variables:
# Default image and distro
CI_PARAM_IMAGE: guf-image
CI_PARAM_DISTRO: guf-wayland
+ # Flash-N-Go image and distro
+ #
+ # In the past, the buildfng job overwrote the image and distro itself.
+ # Because of the transition to the new seconorth names, the image and
+ # distro for the buildfng must be settable from outside of the job.
+ CI_PARAM_IMAGE_FNG: fngsystem-image
+ CI_PARAM_DISTRO_FNG: guf-fngsystem
workflow:
rules:
@@ -126,8 +133,8 @@ changelog:
extends:
- .buildimage
variables:
- CI_PARAM_IMAGE: fngsystem-image
- CI_PARAM_DISTRO: guf-fngsystem
+ CI_PARAM_IMAGE: ${CI_PARAM_IMAGE_FNG}
+ CI_PARAM_DISTRO: ${CI_PARAM_DISTRO_FNG}
build:merge_request:
extends: .infrastructure
--
GitLab