summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2021-09-22 09:11:10 +0200
committerThomas Haller <thaller@redhat.com>2021-09-22 10:12:24 +0200
commitdc8c9d4bd2750f532a3df35a306062584f7141c1 (patch)
tree40bb1b26c5bac6e16b06d39374884da19621d170
parent82b72a7379d843dd3ab875af772675b0287a822c (diff)
downloadNetworkManager-dc8c9d4bd2750f532a3df35a306062584f7141c1.tar.gz
gitlab-ci: update used ci-templates version
It seems there is a problem building f35/f36 containers. Update the ci-templates version.
-rw-r--r--.gitlab-ci.yml12
-rw-r--r--.gitlab-ci/ci.template2
2 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5e97a3cbf..6e9576afdc 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-08-30.0-34fd7cff642b'
- UBUNTU_TAG: '2021-08-30.0-391abd1a04e8'
- DEBIAN_TAG: '2021-08-30.0-391abd1a04e8'
- CENTOS_TAG: '2021-08-30.0-34fd7cff642b'
- ALPINE_TAG: '2021-08-30.0-2ea2ced952a4'
+ FEDORA_TAG: '2021-08-30.0-15503e4652cd'
+ UBUNTU_TAG: '2021-08-30.0-b6e85e3de80a'
+ DEBIAN_TAG: '2021-08-30.0-b6e85e3de80a'
+ CENTOS_TAG: '2021-08-30.0-15503e4652cd'
+ ALPINE_TAG: '2021-08-30.0-8bd67c08dbfb'
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 5f8b9eeb77..bfaf858fad 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") %}