From a341e97f74c387e10c2d1e335f1be0dbc4006139 Mon Sep 17 00:00:00 2001
From: Karol Latecki <karol.latecki@intel.com>
Date: Thu, 9 Dec 2021 16:46:18 +0100
Subject: [PATCH] scripts/vagrant: update Fedora vesions.

Update scripts with Fedora 35 and remove older
versions which we no longer use.

Change-Id: I54d9f3bcf76065f3e4e3094411d77153c351afc9
Signed-off-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10612
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
---
 scripts/vagrant/Vagrantfile    | 2 +-
 scripts/vagrant/create_vbox.sh | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/vagrant/Vagrantfile b/scripts/vagrant/Vagrantfile
index dbbb1f07c..00b407d50 100644
--- a/scripts/vagrant/Vagrantfile
+++ b/scripts/vagrant/Vagrantfile
@@ -13,9 +13,9 @@ def get_box_type(distro, force_distro)
     'ubuntu1604' => 'peru/ubuntu-16.04-server-amd64',
     'ubuntu1804' => 'peru/ubuntu-18.04-server-amd64',
     'ubuntu2004' => 'peru/ubuntu-20.04-server-amd64',
-    'fedora32'   => 'generic/fedora32',
     'fedora33'   => 'generic/fedora33',
     'fedora34'   => 'fedora/34-cloud-base',
+    # Placeholder for F35, no generic image on Vagrant Cloud yet
     'arch'       => 'generic/arch',
     'freebsd12'  => 'generic/freebsd12',
   }
diff --git a/scripts/vagrant/create_vbox.sh b/scripts/vagrant/create_vbox.sh
index 999ed88ae..7635e3ea0 100755
--- a/scripts/vagrant/create_vbox.sh
+++ b/scripts/vagrant/create_vbox.sh
@@ -19,8 +19,8 @@ display_help() {
 	echo
 	echo " Usage: ${0##*/} [-b nvme-backing-file] [-n <num-cpus>] [-s <ram-size>] [-x <http-proxy>] [-hvrldcuf] <distro>"
 	echo
-	echo "  distro = <centos7 | centos8| ubuntu1604 | ubuntu1804 | ubuntu2004 |"
-	echo "            fedora32 | fedora33 | fedora34 | freebsd11 | freebsd12 | arch | clearlinux>"
+	echo "  distro = <centos7 | centos8| ubuntu1604 | ubuntu1804 | ubuntu2004 | fedora33 |"
+	echo "            fedora34 | fedora35 | freebsd11 | freebsd12 | arch | clearlinux>"
 	echo
 	echo "  -s <ram-size> in MB             Default: ${SPDK_VAGRANT_VMRAM}"
 	echo "  -n <num-cpus> 1 to 4            Default: ${SPDK_VAGRANT_VMCPU}"
@@ -169,7 +169,7 @@ SPDK_VAGRANT_DISTRO="$*"
 case "${SPDK_VAGRANT_DISTRO}" in
 	centos[78]) ;&
 	ubuntu1[68]04 | ubuntu2004) ;&
-	fedora3[2-4]) ;&
+	fedora3[3-5]) ;&
 	freebsd1[12]) ;&
 	arch | clearlinux) ;;
 	*)