Commit 62b501dd authored by Karol Latecki's avatar Karol Latecki Committed by Tomasz Zawadzki
Browse files

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: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10612


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 91b8cd37

scripts/vagrant/Vagrantfile

+1 −1
Original line number Diff line number Diff line
@@ -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',

  }

scripts/vagrant/create_vbox.sh

+3 −3
Original line number Diff line number Diff line
@@ -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) ;;

	*)