diff options
| author | Andreas Schneider <asn@samba.org> | 2020-11-04 16:15:16 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2020-11-05 00:17:54 +0000 |
| commit | 8aebd48698e3d41f3d27a5c4710729387760c6d4 (patch) | |
| tree | 6e10f002986e83450300782798ada9dd020ac036 /.gitlab-ci.yml | |
| parent | 005435dc4d7de9d442c7513edec8c782fe20fda3 (diff) | |
| download | samba-8aebd48698e3d41f3d27a5c4710729387760c6d4.tar.gz | |
bootstrap: Add Fedora 33
This removes Fedora 31 support.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Thu Nov 5 00:17:55 UTC 2020 on sn-devel-184
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 16 |
1 files changed, 8 insertions, 8 deletions
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 ... # |