Commit 8439c53b authored by wawryk's avatar wawryk Committed by Tomasz Zawadzki
Browse files

scripts/vagrant: add fedora34 



also remove out of support fedora31

Signed-off-by: default avatarwawryk <maciejx.wawryk@intel.com>
Change-Id: I2ec224a3fb3849eb62ba46a01aa74c62926174f8
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8461


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarPawel Piatek <pawelx.piatek@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent d651f8a2

scripts/vagrant/Vagrantfile

+3 −3
Original line number Diff line number Diff line
@@ -13,9 +13,9 @@ def get_box_type(distro) 
    'ubuntu1604' => 'peru/ubuntu-16.04-server-amd64',

    'ubuntu1804' => 'peru/ubuntu-18.04-server-amd64',

    'ubuntu2004' => 'peru/ubuntu-20.04-server-amd64',

    'fedora31'   => 'generic/fedora31',

    'fedora32'   => 'generic/fedora32',

    'fedora33'   => 'generic/fedora33',

    'fedora34'   => 'fedora/34-cloud-base',

    'arch'       => 'generic/arch',

    'freebsd12'  => 'generic/freebsd12',

  }
@@ -291,8 +291,8 @@ def setup_libvirt(config, vmcpu, vmram, distro) 
end



#################################################################################################

# Pick the right distro and bootstrap, default is fedora31

distro = (ENV['SPDK_VAGRANT_DISTRO'] || "fedora31")

# Pick the right distro and bootstrap, default is fedora33

distro = (ENV['SPDK_VAGRANT_DISTRO'] || "fedora33")

provider = (ENV['SPDK_VAGRANT_PROVIDER'] || "virtualbox")



# Get all variables for creating vm

scripts/vagrant/create_vbox.sh

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ display_help() { 
	echo " Usage: ${0##*/} [-b nvme-backing-file] [-n <num-cpus>] [-s <ram-size>] [-x <http-proxy>] [-hvrldcu] <distro>"

	echo

	echo "  distro = <centos7 | centos8| ubuntu1604 | ubuntu1804 | ubuntu2004 |"

	echo "            fedora31 | fedora32 | fedora33 | freebsd11 | freebsd12 | arch | clearlinux>"

	echo "            fedora32 | fedora33 | fedora34 | 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}"
@@ -162,7 +162,7 @@ SPDK_VAGRANT_DISTRO="$*" 
case "${SPDK_VAGRANT_DISTRO}" in

	centos[78]) ;&

	ubuntu1[68]04 | ubuntu2004) ;&

	fedora3[1-3]) ;&

	fedora3[2-4]) ;&

	freebsd1[12]) ;&

	arch | clearlinux)

		export SPDK_VAGRANT_DISTRO