Merge pull request #1109 from marquiz/devel/fedora

Drop support for EOL'd Fedora
intel · Sep 6, 2024 · b0e50e3 · b0e50e3
2 parents 7d9fca2 + 5998342
commit b0e50e3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 22 deletions.
diff --git a/demo/lib/distro.bash b/demo/lib/distro.bash
@@ -316,23 +316,11 @@ YUM_INSTALL="yum install --disableplugin=fastestmirror -y"
 YUM_REMOVE="yum remove --disableplugin=fastestmirror -y"
 
 fedora-image-url() {
-    fedora-38-image-url
+    fedora-40-image-url
 }
 
-fedora-38-image-url() {
-    echo "https://mirrors.xtom.de/fedora/releases/38/Cloud/x86_64/images/Fedora-Cloud-Base-38-1.6.x86_64.qcow2"
-}
-
-fedora-35-image-url() {
-    echo "https://mirrors.xtom.de/fedora/releases/35/Cloud/x86_64/images/Fedora-Cloud-Base-35-1.2.x86_64.qcow2"
-}
-
-fedora-34-image-url() {
-    echo "https://mirrors.xtom.de/fedora/releases/34/Cloud/x86_64/images/Fedora-Cloud-Base-34-1.2.x86_64.qcow2"
-}
-
-fedora-33-image-url() {
-    echo "https://mirrors.xtom.de/fedora/releases/33/Cloud/x86_64/images/Fedora-Cloud-Base-33-1.2.x86_64.qcow2"
+fedora-40-image-url() {
+    echo "https://mirrors.xtom.de/fedora/releases/40/Cloud/x86_64/images/Fedora-Cloud-Base-Generic.x86_64-40-1.14.qcow2"
 }
 
 fedora-ssh-user() {
@@ -397,7 +385,7 @@ fedora-install-kernel-dev() {
       fedpkg clone -a kernel
       cd kernel
       git fetch
-      git switch ${VM_DISTRO/edora-/} # example: git switch f35 in fedora-35
+      git switch ${VM_DISTRO/edora-/} # example: git switch f40 in fedora-40
       sed -i 's/# define buildid .local/%define buildid .e2e/g' kernel.spec
     )" || {
         echo "installing kernel development environment failed"
@@ -540,10 +528,6 @@ fedora-set-kernel-cmdline() {
     }
 }
 
-fedora-33-install-crio-pre() {
-    fedora-install-crio-version 1.20
-}
-
 ###########################################################################
 
 #

diff --git a/test/e2e/run.sh b/test/e2e/run.sh
@@ -100,7 +100,7 @@ usage() {
     echo "             See: python3 ${DEMO_LIB_DIR}/topology2qemuopts.py --help"
     echo "    distro:  Linux distribution to be / already installed on vm."
     echo "             Supported values: debian-10, debian-sid"
-    echo "                 fedora, fedora-33, opensuse-tumbleweed,"
+    echo "                 fedora, opensuse-tumbleweed,"
     echo "                 opensuse-15.5 (same as opensuse), sles,"
     echo "                 ubuntu-18.04, ubuntu-20.04, ubuntu-22.04"
     echo "             If sles: set VM_SLES_REGCODE=<CODE> to use official packages."

diff --git a/test/e2e/run_all_configurations.sh b/test/e2e/run_all_configurations.sh
@@ -4,7 +4,7 @@ RUN_SH="${0%/*}/run.sh"
 PAIRWISE="${0%/*}/../../scripts/testing/pairwise"
 
 "${PAIRWISE}" \
-    distro={debian-sid,fedora-35,fedora-34,opensuse-tumbleweed} \
+    distro={debian-sid,fedora-40,opensuse-tumbleweed} \
     k8scri={containerd,crio,cri-resmgr\|containerd,cri-resmgr\|crio} \
     k8scni={cilium,flannel,weavenet} | while read -r env_vars; do