From 4ff84d86ace2420b0f6c25fd4e760b8924ebaa41 Mon Sep 17 00:00:00 2001
From: Timo Koch <timokoch@math.uio.no>
Date: Tue, 31 Oct 2023 15:07:25 +0000
Subject: [PATCH] Merge branch 'ci/update-ubuntu-to-22.04' into 'master'
[ci] Use ubuntu version images in the CI from 20.04 to 22.04.
See merge request dumux-repositories/dumux!3693
(cherry picked from commit d3fb5e863a137fcd192ffa30e4a9e3f5a7514689)
34ca39da [ci] Use ubuntu version images in the CI from 20.04 to 22.04.
---
.gitlab-ci.yml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f3927641cb..6ecbeb2adc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,7 @@ workflow:
# pipeline on a related merge request already. If yes, we simply return
# to propagate that pipeline status on master. Otherwise, we trigger a new run.
check-pipeline-status:
- image: $IMAGE_REGISTRY_URL/full:dune-$DUMUX_CI_DUNE_LATEST_RELEASE-gcc-ubuntu-20.04
+ image: $IMAGE_REGISTRY_URL/full:dune-$DUMUX_CI_DUNE_LATEST_RELEASE-gcc-ubuntu-22.04
stage: check-status
rules:
- if: $CI_PIPELINE_SOURCE == "schedule"
@@ -98,22 +98,22 @@ check-pipeline-status:
full-dune-latest-release-gcc:
extends: .base-trigger
variables:
- IMAGE: $IMAGE_REGISTRY_URL/full:dune-$DUMUX_CI_DUNE_LATEST_RELEASE-gcc-ubuntu-20.04
+ IMAGE: $IMAGE_REGISTRY_URL/full:dune-$DUMUX_CI_DUNE_LATEST_RELEASE-gcc-ubuntu-22.04
minimal-dune-latest-release-gcc:
extends: .base-trigger
variables:
- IMAGE: $IMAGE_REGISTRY_URL/minimal:dune-$DUMUX_CI_DUNE_LATEST_RELEASE-gcc-ubuntu-20.04
+ IMAGE: $IMAGE_REGISTRY_URL/minimal:dune-$DUMUX_CI_DUNE_LATEST_RELEASE-gcc-ubuntu-22.04
minimal-dune-master-release-clang:
extends: .base-trigger
variables:
- IMAGE: $IMAGE_REGISTRY_URL/minimal:dune-master-clang-ubuntu-20.04
+ IMAGE: $IMAGE_REGISTRY_URL/minimal:dune-master-clang-ubuntu-22.04
full-dune-latest-release-clang:
extends: .base-trigger
variables:
- IMAGE: $IMAGE_REGISTRY_URL/full:dune-$DUMUX_CI_DUNE_LATEST_RELEASE-clang-ubuntu-20.04
+ IMAGE: $IMAGE_REGISTRY_URL/full:dune-$DUMUX_CI_DUNE_LATEST_RELEASE-clang-ubuntu-22.04
full-dune-master-gcc-cpp-20:
extends: .base-trigger
@@ -129,12 +129,12 @@ full-dune-master-gcc-cpp-20:
full-dune-master-clang:
extends: .non-mr-trigger
variables:
- IMAGE: $IMAGE_REGISTRY_URL/full:dune-master-clang-ubuntu-20.04
+ IMAGE: $IMAGE_REGISTRY_URL/full:dune-master-clang-ubuntu-22.04
full-dune-master-gcc:
extends: .non-mr-trigger
variables:
- IMAGE: $IMAGE_REGISTRY_URL/full:dune-master-gcc-ubuntu-20.04
+ IMAGE: $IMAGE_REGISTRY_URL/full:dune-master-gcc-ubuntu-22.04
################################################
# trigger test pipelines of downstream modules #
--
GitLab