From 84f442c8f515c4f1ae19fe0df9d0013f1c13c323 Mon Sep 17 00:00:00 2001
From: Martin Heistermann <git@mheistermann.de>
Date: Mon, 17 Feb 2025 20:25:40 +0100
Subject: [PATCH] release selection for trixie support
---
.gitlab-ci.yml | 15 +++++++++++++--
templates/{bookworm.yml => debian.yml} | 6 ++++--
2 files changed, 17 insertions(+), 4 deletions(-)
rename templates/{bookworm.yml => debian.yml} (90%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7673f75..60f74e0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,9 +5,20 @@ stages:
include:
# include the component located in the current project from the current SHA
- - component: $CI_SERVER_FQDN/$CI_PROJECT_PATH/bookworm@$CI_COMMIT_SHA
+ - component: $CI_SERVER_FQDN/$CI_PROJECT_PATH/debian@$CI_COMMIT_SHA
inputs:
- stage: component
+ stage: 'component'
+ debian_release: 'bookworm'
+ src_folder: 'demo'
+ tags:
+ - cgg
+ - linux
+ - docker-docker
+ job_name_prefix: "pref-"
+ - component: $CI_SERVER_FQDN/$CI_PROJECT_PATH/debian@$CI_COMMIT_SHA
+ inputs:
+ stage: 'component'
+ debian_release: 'trixie'
src_folder: 'demo'
tags:
- cgg
diff --git a/templates/bookworm.yml b/templates/debian.yml
similarity index 90%
rename from templates/bookworm.yml
rename to templates/debian.yml
index cc1cb1b..7413a4c 100644
--- a/templates/bookworm.yml
+++ b/templates/debian.yml
@@ -2,6 +2,8 @@ spec:
inputs:
stage:
default: test
+ debian_release:
+ default: "bookworm"
BUILD_TYPE:
default: Release
C_COMPILER:
@@ -58,8 +60,8 @@ spec:
junit: "${BUILD_DIR}/test-report-${BUILD_TYPE}.xml"
-"$[[ inputs.job_name_prefix ]]debian-bookworm-x64":
+"$[[ inputs.job_name_prefix ]]debian-$[[ inputs.debian_release ]]-x64":
extends:
- ".$[[ inputs.job_name_prefix ]]debian"
- image: gitlab.inf.unibe.ch:5001/cgg-public/containers/buildbox-debian-linux:x64-bookworm-latest
+ image: gitlab.inf.unibe.ch:5001/cgg-public/containers/buildbox-debian-linux:x64-$[[ inputs.debian_release ]]-latest
--
GitLab