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

.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 ...
 #

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:

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',

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"

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

bootstrap/sha1sum.txt

@@ -1 +1 @@
-d6f5c29855b1bf8173d2e75668487c49c7ee75ac
+66bfd3037078ebaa3395adfd563e8cc78d49d4d3