summaryrefslogtreecommitdiff
path: root/.gitlab-ci-main.yml
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2021-05-06 15:24:06 +0200
committerAndreas Schneider <asn@cryptomilk.org>2021-05-07 07:18:01 +0000
commitac78b921dafa3372eee747caabd094fb5a05cf6b (patch)
treefa74f2a501e60513c2ecba32e84e89a173b38f7f /.gitlab-ci-main.yml
parent755566566440a4432db09e7cdc1733eb43354095 (diff)
downloadsamba-ac78b921dafa3372eee747caabd094fb5a05cf6b.tar.gz
bootstrap: Add Fedora 34 CI runner
Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Guenther Deschner <gd@samba.org> Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org> Autobuild-Date(master): Fri May 7 07:18:02 UTC 2021 on sn-devel-184
Diffstat (limited to '.gitlab-ci-main.yml')
-rw-r--r--.gitlab-ci-main.yml16
1 files changed, 8 insertions, 8 deletions
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 12024e01f94..af51a233561 100644
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -42,7 +42,7 @@ variables:
# Set this to the contents of bootstrap/sha1sum.txt
# which is generated by bootstrap/template.py --render
#
- SAMBA_CI_CONTAINER_TAG: d6f5c29855b1bf8173d2e75668487c49c7ee75ac
+ SAMBA_CI_CONTAINER_TAG: 66bfd3037078ebaa3395adfd563e8cc78d49d4d3
#
# We use the ubuntu1804 image as default as
# it matches what we have on sn-devel-184.
@@ -60,8 +60,8 @@ variables:
SAMBA_CI_CONTAINER_IMAGE_debian10: debian10
SAMBA_CI_CONTAINER_IMAGE_opensuse151: opensuse151
SAMBA_CI_CONTAINER_IMAGE_opensuse152: opensuse152
- SAMBA_CI_CONTAINER_IMAGE_fedora32: fedora32
SAMBA_CI_CONTAINER_IMAGE_fedora33: fedora33
+ SAMBA_CI_CONTAINER_IMAGE_fedora34: fedora34
SAMBA_CI_CONTAINER_IMAGE_centos7: centos7
SAMBA_CI_CONTAINER_IMAGE_centos8: centos8
@@ -342,7 +342,7 @@ samba-ad-dc-4b-mitkrb5:
samba-fips:
extends: .shared_template
variables:
- SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora33}
+ SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora34}
.private_test_only:
extends: .private_runner_test
@@ -454,7 +454,7 @@ pages:
coverity:
extends: .shared_runner_build_image
variables:
- SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora33}
+ SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora34}
stage: build
script:
- wget https://scan.coverity.com/download/linux64 --post-data "token=$COVERITY_SCAN_TOKEN&project=$COVERITY_SCAN_PROJECT_NAME" -O /tmp/coverity_tool.tgz
@@ -546,15 +546,15 @@ centos8-samba-o3:
variables:
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_centos8}
-fedora32-samba-o3:
+fedora33-samba-o3:
extends: .samba-o3-template
variables:
- SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora32}
+ SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora33}
-fedora33-samba-o3:
+fedora34-samba-o3:
extends: .samba-o3-template
variables:
- SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora33}
+ SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora34}
#
# Keep the samba-o3 sections at the end ...