summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2020-12-11 18:12:44 +0100
committerThomas Haller <thaller@redhat.com>2020-12-11 18:14:10 +0100
commita6e234349cbfaa2931202850b2b5809473a77d90 (patch)
tree8d3e07ab80b43a199b6416a1c36838821675e41c
parent4ce62b6df324d16dc2e9112a7aea1895981e213b (diff)
downloadNetworkManager-a6e234349cbfaa2931202850b2b5809473a77d90.tar.gz
gitlab-ci: update used "ci-templates" version
-rw-r--r--.gitlab-ci.yml10
-rw-r--r--.gitlab-ci/ci.template2
2 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 097550b423..b20d972996 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@
########################################
-.templates_sha: &template_sha 766e3d77c647e404b349e398427e8965a1769b64 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+.templates_sha: &template_sha b18e53bf67b9ed493a006d83dbadd1ecc0daa61a # see https://docs.gitlab.com/ee/ci/yaml/#includefile
include:
# Centos container builder template
@@ -40,10 +40,10 @@ variables:
# these tags should be updated each time the list of packages is updated
# changing these will force rebuilding the associated image
# Note: these tags have no meaning and are not tied to a particular NM version
- FEDORA_TAG: '2020-11-17.0-6646b220c743'
- UBUNTU_TAG: '2020-11-17.0-89dd88de8047'
- DEBIAN_TAG: '2020-11-17.0-89dd88de8047'
- CENTOS_TAG: '2020-11-17.0-6646b220c743'
+ FEDORA_TAG: '2020-11-17.0-4422fd99fcf1'
+ UBUNTU_TAG: '2020-11-17.0-7ba6b1ddf582'
+ DEBIAN_TAG: '2020-11-17.0-7ba6b1ddf582'
+ CENTOS_TAG: '2020-11-17.0-4422fd99fcf1'
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 aa5ed4327b..f8f13395e4 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -9,7 +9,7 @@
########################################
-.templates_sha: &template_sha 766e3d77c647e404b349e398427e8965a1769b64 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+.templates_sha: &template_sha b18e53bf67b9ed493a006d83dbadd1ecc0daa61a # see https://docs.gitlab.com/ee/ci/yaml/#includefile
include:
{% for distro in distributions|sort(attribute="name") %}