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>
This commit is contained in:
Karol Latecki 2021-12-09 16:46:18 +01:00 committed by Tomasz Zawadzki
parent 91b8cd3791
commit 62b501dd48
2 changed files with 4 additions and 4 deletions

View File

@ -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',
}

View File

@ -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) ;;
*)