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

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

bootstrap/.gitlab-ci.yml

@@ -99,10 +99,10 @@ ubuntu2004:
 debian10:
   extends: .build_image_template
 
-fedora31:
+fedora32:
   extends: .build_image_template
 
-fedora32:
+fedora33:
   extends: .build_image_template
 
 centos8:

bootstrap/config.py

@@ -150,6 +150,7 @@ PKGS = [
     ('libjson-perl', 'perl-JSON'),
     ('', 'perl-JSON-Parse'),
     ('perl-modules', ''),
+    ('', 'perl-FindBin'),
     ('', 'perl-Archive-Tar'),
     ('', 'perl-ExtUtils-MakeMaker'),
     ('', 'perl-Test-Base'),
@@ -443,6 +444,7 @@ RPM_DISTS = {
             # update perl core modules on centos
             # fix: Can't locate Archive/Tar.pm in @INC
             'perl': 'perl-core',
+            'perl-FindBin': '',
             'rpcsvc-proto-devel': '',
             'glusterfs-api-devel': '',
             'glusterfs-devel': '',
@@ -462,24 +464,26 @@ RPM_DISTS = {
             'lcov': '', # does not exist
             'perl-JSON-Parse': '', # does not exist?
             'perl-Test-Base': 'perl-Test-Simple',
+            'perl-FindBin': '',
             'policycoreutils-python': 'python3-policycoreutils',
             'liburing-devel': '', # not available yet, Add me back, once available!
         }
     },
-    'fedora31': {
-        'docker_image': 'fedora:31',
-        'vagrant_box': 'fedora/31-cloud-base',
-        'bootstrap': DNF_BOOTSTRAP,
-        'replace': {
-            'lsb-release': 'redhat-lsb',
-            'libsemanage-python': 'python3-libsemanage',
-            'policycoreutils-python': 'python3-policycoreutils',
-        }
-    },
     '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',
+        'bootstrap': DNF_BOOTSTRAP,
         'replace': {
             'lsb-release': 'redhat-lsb',
             'libsemanage-python': 'python3-libsemanage',
@@ -507,6 +511,7 @@ RPM_DISTS = {
             'perl-JSON-Parse': 'perl-JSON-XS',
             'perl-generators': '',
             'perl-interpreter': '',
+            'perl-FindBin': '',
             'procps-ng': 'procps',
             'python3-dns': 'python3-dnspython',
             'python3-markdown': 'python3-Markdown',
@@ -538,6 +543,7 @@ RPM_DISTS = {
             'perl-JSON-Parse': 'perl-JSON-XS',
             'perl-generators': '',
             'perl-interpreter': '',
+            'perl-FindBin': '',
             'procps-ng': 'procps',
             'python3-dns': 'python3-dnspython',
             'python3-markdown': 'python3-Markdown',

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 "fedora31" do |v|
-        v.vm.box = "fedora/31-cloud-base"
-        v.vm.hostname = "fedora31"
-        v.vm.provision :shell, path: "fedora31/bootstrap.sh"
-        v.vm.provision :shell, path: "fedora31/locale.sh"
-    end
-
     config.vm.define "fedora32" do |v|
         v.vm.box = "fedora/32-cloud-base"
         v.vm.hostname = "fedora32"
@@ -45,6 +38,13 @@ Vagrant.configure("2") do |config|
         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"
+        v.vm.provision :shell, path: "fedora33/bootstrap.sh"
+        v.vm.provision :shell, path: "fedora33/locale.sh"
+    end
+
     config.vm.define "opensuse150" do |v|
         v.vm.box = "opensuse/openSUSE-15.0-x86_64"
         v.vm.hostname = "opensuse150"

bootstrap/generated-dists/fedora33/Dockerfile

@@ -3,7 +3,7 @@
 # See also bootstrap/config.py
 #
 
-FROM fedora:31
+FROM fedora:33
 
 # pass in with --build-arg while build
 ARG SHA1SUM

bootstrap/generated-dists/fedora33/bootstrap.sh

@@ -74,6 +74,7 @@ dnf install -y \
     perl \
     perl-Archive-Tar \
     perl-ExtUtils-MakeMaker \
+    perl-FindBin \
     perl-JSON \
     perl-JSON-Parse \
     perl-Parse-Yapp \

bootstrap/generated-dists/fedora33/packages.yml

@@ -63,6 +63,7 @@ packages:
   - perl
   - perl-Archive-Tar
   - perl-ExtUtils-MakeMaker
+  - perl-FindBin
   - perl-JSON
   - perl-JSON-Parse
   - perl-Parse-Yapp

bootstrap/sha1sum.txt

@@ -1 +1 @@
-86279163d150fb95742f4b34fce0dfc1a639f5de
+446341a5c66a0cd04cac694991e4522385389e0f