diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7673f7558d8b4ba51b40f52dad2af100f381b59e..60f74e04a99845f0ad46a073376e65e7c6705fa8 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 cc1cb1b63ff9bd5240ffd9618cfb76f1d19abba1..7413a4c84541b8e59aa6d67266fbfefb82c04975 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