Cleanup: Fedora 37/38 CI tests & docs (#11600)

* Feat: update the remaining Fedora 37 vagrant CI Signed-off-by: ChengHao Yang <[email protected]> * Cleanup: remove EOL Fedora 37/38 CI tests Signed-off-by: ChengHao Yang <[email protected]> * Docs: remove EOL Fedora 37/38 Signed-off-by: ChengHao Yang <[email protected]> --------- Signed-off-by: ChengHao Yang <[email protected]>
kubernetes-sigs · Oct 7, 2024 · b36ea7b · b36ea7b
1 parent 576695c
commit b36ea7b
Show file tree

Hide file tree

Showing 13 changed files with 5 additions and 122 deletions.
diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml
@@ -169,12 +169,6 @@ packet_ubuntu22-all-in-one-docker:
   extends: .packet_pr_extended
 
 # ### MANUAL JOBS
-packet_fedora37-crio:
-  extends: .packet_pr_manual
-
-packet_fedora39-crio:
-  extends: .packet_pr_manual
-
 packet_ubuntu20-flannel-ha:
   extends: .packet_pr_manual
 
@@ -184,9 +178,6 @@ packet_ubuntu20-all-in-one-docker:
 packet_ubuntu20-flannel-ha-once:
   extends: .packet_pr_manual
 
-packet_fedora37-calico-swap-selinux:
-  extends: .packet_pr_manual
-
 packet_fedora39-calico-swap-selinux:
   extends: .packet_pr_manual
 
@@ -209,22 +200,12 @@ packet_ubuntu20-calico-ha-wireguard:
   extends: .packet_pr_manual
 
 # PERIODIC
-packet_fedora38-docker-calico:
-  stage: deploy-extended
-  extends: .packet_periodic
-  variables:
-    RESET_CHECK: "true"
-
 packet_fedora40-docker-calico:
   stage: deploy-extended
   extends: .packet_periodic
   variables:
     RESET_CHECK: "true"
 
-packet_fedora37-calico-selinux:
-  stage: deploy-extended
-  extends: .packet_periodic
-
 packet_fedora39-calico-selinux:
   stage: deploy-extended
   extends: .packet_periodic

diff --git a/.gitlab-ci/vagrant.yml b/.gitlab-ci/vagrant.yml
@@ -56,7 +56,7 @@ vagrant_ubuntu20-kube-router-svc-proxy:
   extends: .vagrant
   when: manual
 
-vagrant_fedora37-kube-router:
+vagrant_fedora39-kube-router:
   stage: deploy-extended
   extends: .vagrant
   when: manual

diff --git a/README.md b/README.md
@@ -144,7 +144,7 @@ vagrant up
 - **Debian** Bookworm, Bullseye
 - **Ubuntu** 20.04, 22.04, 24.04
 - **CentOS/RHEL** [8, 9](docs/operating_systems/centos.md#centos-8)
-- **Fedora** 37, 38, 39, 40
+- **Fedora** 39, 40
 - **Fedora CoreOS** (see [fcos Note](docs/operating_systems/fcos.md))
 - **openSUSE** Leap 15.x/Tumbleweed
 - **Oracle Linux** [8, 9](docs/operating_systems/centos.md#centos-8)

diff --git a/Vagrantfile b/Vagrantfile
@@ -28,8 +28,6 @@ SUPPORTED_OS = {
   "almalinux8-bento"    => {box: "bento/almalinux-8",          user: "vagrant"},
   "rockylinux8"         => {box: "rockylinux/8",               user: "vagrant"},
   "rockylinux9"         => {box: "rockylinux/9",               user: "vagrant"},
-  "fedora37"            => {box: "fedora/37-cloud-base",       user: "vagrant"},
-  "fedora38"            => {box: "fedora/38-cloud-base",       user: "vagrant"},
   "fedora39"            => {box: "fedora/39-cloud-base",       user: "vagrant"},
   "fedora40"            => {box: "fedora/40-cloud-base",       user: "vagrant"},
   "fedora39-arm64"      => {box: "bento/fedora-39-arm64",      user: "vagrant"},
@@ -228,14 +226,6 @@ Vagrant.configure("2") do |config|
         node.vm.provision "shell", inline: "rm -f /etc/modprobe.d/local.conf"
         node.vm.provision "shell", inline: "sed -i '/net.ipv6.conf.all.disable_ipv6/d' /etc/sysctl.d/99-sysctl.conf /etc/sysctl.conf"
       end
-      # Hack for fedora37/38 to get the IP address of the second interface
-      if ["fedora37", "fedora38"].include? $os
-        config.vm.provision "shell", inline: <<-SHELL
-          nmcli conn modify 'Wired connection 2' ipv4.addresses $(cat /etc/sysconfig/network-scripts/ifcfg-eth1 | grep IPADDR | cut -d "=" -f2)
-          nmcli conn modify 'Wired connection 2' ipv4.method manual
-          service NetworkManager restart
-        SHELL
-      end
       # Hack for fedora39/40 to get the IP address of the second interface
       if ["fedora39", "fedora40", "fedora39-arm64", "fedora40-arm64"].include? $os
         config.vm.provision "shell", inline: <<-SHELL

diff --git a/docs/developers/ci.md b/docs/developers/ci.md
@@ -11,9 +11,7 @@ amazon |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 centos8 |  :white_check_mark: | :x: | :x: | :white_check_mark: | :x: | :white_check_mark: | :x: | :white_check_mark: |
 debian11 |  :white_check_mark: | :x: | :white_check_mark: | :x: | :x: | :x: | :white_check_mark: | :x: |
 debian12 |  :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: |
-fedora37 |  :white_check_mark: | :x: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: |
-fedora38 |  :x: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: | :x: |
-fedora39 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
+fedora39 |  :white_check_mark: | :x: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: |
 fedora40 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 opensuse |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 rockylinux8 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
@@ -31,8 +29,6 @@ amazon |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 centos8 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 debian11 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 debian12 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
-fedora37 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
-fedora38 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 fedora39 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 fedora40 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 opensuse |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
@@ -51,8 +47,6 @@ amazon |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 centos8 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 debian11 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 debian12 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
-fedora37 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
-fedora38 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: |
 fedora39 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 fedora40 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 opensuse |  :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: |

diff --git a/tests/files/packet_fedora37-calico-selinux.yml b/tests/files/packet_fedora37-calico-selinux.yml
diff --git a/tests/files/packet_fedora37-calico-swap-selinux.yml b/tests/files/packet_fedora37-calico-swap-selinux.yml
diff --git a/tests/files/packet_fedora37-crio.yml b/tests/files/packet_fedora37-crio.yml
diff --git a/tests/files/packet_fedora38-docker-calico.yml b/tests/files/packet_fedora38-docker-calico.yml
diff --git a/tests/files/packet_fedora38-docker-weave.yml b/tests/files/packet_fedora38-docker-weave.yml
diff --git a/tests/files/packet_fedora38-kube-ovn.yml b/tests/files/packet_fedora38-kube-ovn.yml
diff --git a/tests/files/vagrant_fedora37-kube-router.rb → tests/files/vagrant_fedora39-kube-router.rb b/tests/files/vagrant_fedora37-kube-router.rb → tests/files/vagrant_fedora39-kube-router.rb
@@ -1,6 +1,6 @@
 $num_instances = 2
 $vm_memory ||= 2048
-$os = "fedora37"
+$os = "fedora39"
 
 $kube_master_instances = 1
 $etcd_instances = 1

diff --git a/tests/files/vagrant_fedora37-kube-router.yml → tests/files/vagrant_fedora39-kube-router.yml b/tests/files/vagrant_fedora37-kube-router.yml → tests/files/vagrant_fedora39-kube-router.yml
@@ -1,6 +1,6 @@
 ---
 # Instance settings
-cloud_image: fedora-37
+cloud_image: fedora-39
 mode: default
 
 # Kubespray settings