gitlab-ci: Drop Fedora 34

It should be enough to run on the latest Fedora version. This should save us some CI minutes. We have CentOS runners and I would prefer to add CentOS9 Stream. Signed-off-by: Andreas Schneider <[email protected]> Reviewed-by: Andrew Bartlett <[email protected]> Reviewed-by: Stefan Metzmacher <[email protected]>
tgl1986 · Mar 23, 2022 · 4993fae · 4993fae
1 parent 0e81b79
commit 4993fae
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 335 deletions.
diff --git 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: 24c7cabf5c7c515ffac905cddc533a26d70abd09
+  SAMBA_CI_CONTAINER_TAG: 101efe433173bdb306063c6d91d5c991a858a9c9
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.
@@ -60,7 +60,6 @@ variables:
   SAMBA_CI_CONTAINER_IMAGE_debian11: debian11
   SAMBA_CI_CONTAINER_IMAGE_opensuse151: opensuse151
   SAMBA_CI_CONTAINER_IMAGE_opensuse152: opensuse152
-  SAMBA_CI_CONTAINER_IMAGE_fedora34: fedora34
   SAMBA_CI_CONTAINER_IMAGE_fedora35: fedora35
   SAMBA_CI_CONTAINER_IMAGE_f35mit120: f35mit120
   SAMBA_CI_CONTAINER_IMAGE_centos7: centos7
@@ -628,11 +627,6 @@ centos8s-samba-o3:
   variables:
     SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_centos8s}
 
-fedora34-samba-o3:
-  extends: .samba-o3-template
-  variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora34}
-
 fedora35-samba-o3:
   extends: .samba-o3-template
   variables:

diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
@@ -100,9 +100,6 @@ debian10:
 debian11:
   extends: .build_image_template
 
-fedora34:
-  extends: .build_image_template
-
 fedora35:
   extends: .build_image_template
 

diff --git a/bootstrap/config.py b/bootstrap/config.py
@@ -495,18 +495,6 @@
             'mold': '',
         }
     },
-    'fedora34': {
-        'docker_image': 'fedora:34',
-        'vagrant_box': 'fedora/34-cloud-base',
-        'bootstrap': DNF_BOOTSTRAP,
-        'replace': {
-            'lsb-release': 'redhat-lsb',
-            'perl-FindBin': '',
-            'python3-iso8601': 'python3-dateutil',
-            'libtracker-sparql-2.0-dev': '',  # only tracker 3.x is available
-            'mold': '',
-        }
-    },
     'fedora35': {
         'docker_image': 'fedora:35',
         'vagrant_box': 'fedora/35-cloud-base',

diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile
@@ -45,13 +45,6 @@ Vagrant.configure("2") do |config|
         v.vm.provision :shell, path: "f35mit120/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 "fedora35" do |v|
         v.vm.box = "fedora/35-cloud-base"
         v.vm.hostname = "fedora35"

diff --git a/bootstrap/generated-dists/fedora34/Dockerfile b/bootstrap/generated-dists/fedora34/Dockerfile
diff --git a/bootstrap/generated-dists/fedora34/bootstrap.sh b/bootstrap/generated-dists/fedora34/bootstrap.sh
diff --git a/bootstrap/generated-dists/fedora34/locale.sh b/bootstrap/generated-dists/fedora34/locale.sh
diff --git a/bootstrap/generated-dists/fedora34/packages.yml b/bootstrap/generated-dists/fedora34/packages.yml
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-24c7cabf5c7c515ffac905cddc533a26d70abd09
+101efe433173bdb306063c6d91d5c991a858a9c9
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		24c7cabf5c7c515ffac905cddc533a26d70abd09
		101efe433173bdb306063c6d91d5c991a858a9c9