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,16 +546,16 @@ centos8-samba-o3: variables: SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_centos8} -fedora32-samba-o3: - extends: .samba-o3-template - variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora32} - fedora33-samba-o3: extends: .samba-o3-template variables: SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora33} +fedora34-samba-o3: + extends: .samba-o3-template + variables: + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora34} + # # Keep the samba-o3 sections at the end ... # diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml index 1a8376daa4c..5e5856b1e90 100644 --- a/bootstrap/.gitlab-ci.yml +++ b/bootstrap/.gitlab-ci.yml @@ -103,10 +103,10 @@ ubuntu2004: debian10: extends: .build_image_template -fedora32: +fedora33: extends: .build_image_template -fedora33: +fedora34: extends: .build_image_template centos8: diff --git a/bootstrap/config.py b/bootstrap/config.py index 39e1fafdeea..bfd5b947d07 100644 --- a/bootstrap/config.py +++ b/bootstrap/config.py @@ -472,17 +472,6 @@ RPM_DISTS = { 'liburing-devel': '', # not available yet, Add me back, once available! } }, - 'fedora32': { - 'docker_image': 'fedora:32', - 'vagrant_box': 'fedora/32-cloud-base', - 'bootstrap': DNF_BOOTSTRAP, - 'replace': { - 'lsb-release': 'redhat-lsb', - 'libsemanage-python': 'python3-libsemanage', - 'policycoreutils-python': 'python3-policycoreutils', - 'perl-FindBin': '', - } - }, 'fedora33': { 'docker_image': 'fedora:33', 'vagrant_box': 'fedora/33-cloud-base', @@ -493,6 +482,17 @@ RPM_DISTS = { 'policycoreutils-python': 'python3-policycoreutils', } }, + 'fedora34': { + 'docker_image': 'fedora:34', + 'vagrant_box': 'fedora/34-cloud-base', + 'bootstrap': DNF_BOOTSTRAP, + 'replace': { + 'lsb-release': 'redhat-lsb', + 'libsemanage-python': 'python3-libsemanage', + 'policycoreutils-python': 'python3-policycoreutils', + 'perl-FindBin': '', + } + }, 'opensuse151': { 'docker_image': 'opensuse/leap:15.1', 'vagrant_box': 'opensuse/openSUSE-15.1-x86_64', diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile index 042e45238d3..42da0161e40 100644 --- a/bootstrap/generated-dists/Vagrantfile +++ b/bootstrap/generated-dists/Vagrantfile @@ -31,13 +31,6 @@ Vagrant.configure("2") do |config| v.vm.provision :shell, path: "debian10/locale.sh" end - config.vm.define "fedora32" do |v| - v.vm.box = "fedora/32-cloud-base" - v.vm.hostname = "fedora32" - v.vm.provision :shell, path: "fedora32/bootstrap.sh" - v.vm.provision :shell, path: "fedora32/locale.sh" - end - config.vm.define "fedora33" do |v| v.vm.box = "fedora/33-cloud-base" v.vm.hostname = "fedora33" @@ -45,6 +38,13 @@ Vagrant.configure("2") do |config| v.vm.provision :shell, path: "fedora33/locale.sh" end + config.vm.define "fedora34" do |v| + v.vm.box = "fedora/34-cloud-base" + v.vm.hostname = "fedora34" + v.vm.provision :shell, path: "fedora34/bootstrap.sh" + v.vm.provision :shell, path: "fedora34/locale.sh" + end + config.vm.define "opensuse151" do |v| v.vm.box = "opensuse/openSUSE-15.1-x86_64" v.vm.hostname = "opensuse151" diff --git a/bootstrap/generated-dists/fedora32/Dockerfile b/bootstrap/generated-dists/fedora34/Dockerfile similarity index 92% rename from bootstrap/generated-dists/fedora32/Dockerfile rename to bootstrap/generated-dists/fedora34/Dockerfile index d8a75cf8445..0ce89448a5f 100644 --- a/bootstrap/generated-dists/fedora32/Dockerfile +++ b/bootstrap/generated-dists/fedora34/Dockerfile @@ -3,7 +3,7 @@ # See also bootstrap/config.py # -FROM fedora:32 +FROM fedora:34 # pass in with --build-arg while build ARG SHA1SUM diff --git a/bootstrap/generated-dists/fedora32/bootstrap.sh b/bootstrap/generated-dists/fedora34/bootstrap.sh similarity index 100% rename from bootstrap/generated-dists/fedora32/bootstrap.sh rename to bootstrap/generated-dists/fedora34/bootstrap.sh diff --git a/bootstrap/generated-dists/fedora32/locale.sh b/bootstrap/generated-dists/fedora34/locale.sh similarity index 100% rename from bootstrap/generated-dists/fedora32/locale.sh rename to bootstrap/generated-dists/fedora34/locale.sh diff --git a/bootstrap/generated-dists/fedora32/packages.yml b/bootstrap/generated-dists/fedora34/packages.yml similarity index 100% rename from bootstrap/generated-dists/fedora32/packages.yml rename to bootstrap/generated-dists/fedora34/packages.yml diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt index 186035eb906..e2800636e59 100644 --- a/bootstrap/sha1sum.txt +++ b/bootstrap/sha1sum.txt @@ -1 +1 @@ -d6f5c29855b1bf8173d2e75668487c49c7ee75ac +66bfd3037078ebaa3395adfd563e8cc78d49d4d3