From 1da22aaefa4726f7d93c1c503fce5492d4613ad7 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 22 Sep 2021 09:11:10 +0200 Subject: [PATCH] gitlab-ci: update used ci-templates version It seems there is a problem building f35/f36 containers. Update the ci-templates version. (cherry picked from commit dc8c9d4bd2750f532a3df35a306062584f7141c1) --- .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 c953166e9b..8a8387d7e5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ ######################################## -.templates_sha: &template_sha b18e53bf67b9ed493a006d83dbadd1ecc0daa61a # see https://docs.gitlab.com/ee/ci/yaml/#includefile +.templates_sha: &template_sha 14731f78c23c7b523a85a26a068ade9ac1ecd2f3 # see https://docs.gitlab.com/ee/ci/yaml/#includefile include: # Alpine container builder template @@ -47,11 +47,11 @@ variables: # # This is done by running `ci-fairy generate-template` and possibly bump # ".default_tag". - FEDORA_TAG: '2021-07-12.0-b19516ac22b6' - UBUNTU_TAG: '2021-07-12.0-b77047ed62be' - DEBIAN_TAG: '2021-07-12.0-b77047ed62be' - CENTOS_TAG: '2021-07-12.0-b19516ac22b6' - ALPINE_TAG: '2021-07-12.0-d7a8aea74089' + FEDORA_TAG: '2021-07-12.0-f3bd83023528' + UBUNTU_TAG: '2021-07-12.0-ceca385e1904' + DEBIAN_TAG: '2021-07-12.0-ceca385e1904' + CENTOS_TAG: '2021-07-12.0-f3bd83023528' + ALPINE_TAG: '2021-07-12.0-a623f8d1b2f8' FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh' UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh' diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index ee28a32b07..04428d0f32 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -9,7 +9,7 @@ ######################################## -.templates_sha: &template_sha b18e53bf67b9ed493a006d83dbadd1ecc0daa61a # see https://docs.gitlab.com/ee/ci/yaml/#includefile +.templates_sha: &template_sha 14731f78c23c7b523a85a26a068ade9ac1ecd2f3 # see https://docs.gitlab.com/ee/ci/yaml/#includefile include: {% for distro in distributions|sort(attribute="name") %}