From 8aebd48698e3d41f3d27a5c4710729387760c6d4 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 4 Nov 2020 16:15:16 +0100 Subject: bootstrap: Add Fedora 33 This removes Fedora 31 support. Signed-off-by: Andreas Schneider Reviewed-by: Alexander Bokovoy Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Thu Nov 5 00:17:55 UTC 2020 on sn-devel-184 --- .gitlab-ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8fad80033b4..77c57135b86 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,7 +32,7 @@ variables: # Set this to the contents of bootstrap/sha1sum.txt # which is generated by bootstrap/template.py --render # - SAMBA_CI_CONTAINER_TAG: 86279163d150fb95742f4b34fce0dfc1a639f5de + SAMBA_CI_CONTAINER_TAG: 446341a5c66a0cd04cac694991e4522385389e0f # # We use the ubuntu1804 image as default as # it matches what we have on sn-devel-184. @@ -50,8 +50,8 @@ variables: SAMBA_CI_CONTAINER_IMAGE_debian10: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-debian10:${SAMBA_CI_CONTAINER_TAG} SAMBA_CI_CONTAINER_IMAGE_opensuse150: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-opensuse150:${SAMBA_CI_CONTAINER_TAG} SAMBA_CI_CONTAINER_IMAGE_opensuse151: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-opensuse151:${SAMBA_CI_CONTAINER_TAG} - SAMBA_CI_CONTAINER_IMAGE_fedora31: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-fedora31:${SAMBA_CI_CONTAINER_TAG} SAMBA_CI_CONTAINER_IMAGE_fedora32: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-fedora32:${SAMBA_CI_CONTAINER_TAG} + SAMBA_CI_CONTAINER_IMAGE_fedora33: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-fedora33:${SAMBA_CI_CONTAINER_TAG} SAMBA_CI_CONTAINER_IMAGE_centos7: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-centos7:${SAMBA_CI_CONTAINER_TAG} SAMBA_CI_CONTAINER_IMAGE_centos8: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-centos8:${SAMBA_CI_CONTAINER_TAG} @@ -193,7 +193,7 @@ samba-ad-dc-4-mitkrb5: samba-fips: stage: build_first extends: .shared_template - image: $SAMBA_CI_CONTAINER_IMAGE_fedora32 + image: $SAMBA_CI_CONTAINER_IMAGE_fedora33 .private_template: extends: .shared_template @@ -274,7 +274,7 @@ pages: # Coverity Scan coverity: stage: build - image: $SAMBA_CI_CONTAINER_IMAGE_fedora32 + image: $SAMBA_CI_CONTAINER_IMAGE_fedora33 tags: - docker - shared @@ -351,14 +351,14 @@ centos8-samba-o3: extends: .samba-o3-template image: $SAMBA_CI_CONTAINER_IMAGE_centos8 -fedora31-samba-o3: - extends: .samba-o3-template - image: $SAMBA_CI_CONTAINER_IMAGE_fedora31 - fedora32-samba-o3: extends: .samba-o3-template image: $SAMBA_CI_CONTAINER_IMAGE_fedora32 +fedora33-samba-o3: + extends: .samba-o3-template + image: $SAMBA_CI_CONTAINER_IMAGE_fedora33 + # # Keep the samba-o3 sections at the end ... # -- cgit v1.2.1