d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scripts/vagrant: add fedora34

Browse Source 
also remove out of support fedora31

Signed-off-by: wawryk <maciejx.wawryk@intel.com>
Change-Id: I2ec224a3fb3849eb62ba46a01aa74c62926174f8
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8461
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Pawel Piatek <pawelx.piatek@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
wawryk 2021-06-22 10:52:41 +02:00 committed by Tomasz Zawadzki
parent d651f8a238
commit 8439c53b94
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/vagrant/Vagrantfile vendored
View File

@ -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

4
scripts/vagrant/create_vbox.sh
View File

@ -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