From fe5a09b1ad65da3140f536afbffcc4c9e27f4825 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=8D=C3=B1igo=20Huguet?= Date: Thu, 10 Oct 2024 07:53:29 +0200 Subject: [PATCH] ci: Update ci-templates to a version that support Alpine versions ci-templates only supported alpine:latest, but support for any other version has been introduced. Use it so our Alpine pipelines stop failing. (cherry picked from commit 9354fabaa8f344b1ede0d4fdf549ee1da8f2e41e) (cherry picked from commit 2035048449c2e73a9e3fb9efb85ffdd206e7018e) --- .gitlab-ci.yml | 12 ++++++------ .gitlab-ci/ci.template | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3c20ac1d36..c23fe7f0f7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ # see https://docs.gitlab.com/ee/ci/yaml/#includefile -.templates_sha: &template_sha 98b1218f146a1ec96d65e3ce0041f9a6ec5cb5e6 +.templates_sha: &template_sha 593a0a5fe35a523a646a7efae5471c9759b8fba3 @@ -57,11 +57,11 @@ variables: # # This is done by running `ci-fairy generate-template` and possibly bumping # ".default_tag". - ALPINE_TAG: 'tag-a4614e7b0985' - CENTOS_TAG: 'tag-04df72fa6a45' - DEBIAN_TAG: 'tag-7bf37da7bcaf' - FEDORA_TAG: 'tag-04df72fa6a45' - UBUNTU_TAG: 'tag-7bf37da7bcaf' + ALPINE_TAG: 'tag-f8dbeb1b5447' + CENTOS_TAG: 'tag-e4b3d317d892' + DEBIAN_TAG: 'tag-1a6b905f50f7' + FEDORA_TAG: 'tag-e4b3d317d892' + UBUNTU_TAG: 'tag-1a6b905f50f7' ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh' CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh' diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index 7030fda228..7a0eeb308c 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -16,7 +16,7 @@ # see https://docs.gitlab.com/ee/ci/yaml/#includefile -.templates_sha: &template_sha 98b1218f146a1ec96d65e3ce0041f9a6ec5cb5e6 +.templates_sha: &template_sha 593a0a5fe35a523a646a7efae5471c9759b8fba3 {# Group distros by their common (name,) tuples.#} {% set distro_groups = [] %}