From d73a214876b7fe4b2bde33fe34e81721200237e6 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) (cherry picked from commit fe5a09b1ad65da3140f536afbffcc4c9e27f4825) (cherry picked from commit 3d80f73b3c897900828e0b170d1bcbf7d03d0e1f) --- .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 18229b89eb..babf208637 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 184ca628f89f3193c249b4e34e45afee2773a833 +.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-a53799f015bb' - CENTOS_TAG: 'tag-0711a92b9f36' - DEBIAN_TAG: 'tag-0f5f286d0007' - FEDORA_TAG: 'tag-0711a92b9f36' - UBUNTU_TAG: 'tag-0f5f286d0007' + ALPINE_TAG: 'tag-1c70b29428ec' + CENTOS_TAG: 'tag-2cb2833dac41' + DEBIAN_TAG: 'tag-f67de1515aea' + FEDORA_TAG: 'tag-2cb2833dac41' + UBUNTU_TAG: 'tag-f67de1515aea' 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 53cbd2762b..fd19ad5cfe 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 184ca628f89f3193c249b4e34e45afee2773a833 +.templates_sha: &template_sha 593a0a5fe35a523a646a7efae5471c9759b8fba3 {# Group distros by their common (name,) tuples.#} {% set distro_groups = [] %}