ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scripts/vagrant: Replace out of date fedora30 by new fedora33

Browse Source 
Signed-off-by: Maciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: I4e72262a1d6bb9913e0443dd94eb628c48e322a7
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5111
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
This commit is contained in:
Maciej Wawryk 2020-11-16 14:06:35 +01:00 committed by Tomasz Zawadzki
parent 252ba4dfa5
commit 348bd072df
2 changed files with 13 additions and 13 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',
'fedora30' => 'generic/fedora30',
'fedora31' => 'generic/fedora31',
'fedora32' => 'generic/fedora32',
'fedora33' => 'generic/fedora33',
'arch' => 'generic/arch',
'freebsd11' => 'generic/freebsd11',
'freebsd12' => 'generic/freebsd12',
@ -278,8 +278,8 @@ def setup_libvirt(config, vmcpu, vmram, distro)
end
#################################################################################################
# Pick the right distro and bootstrap, default is fedora30
distro = (ENV['SPDK_VAGRANT_DISTRO'] || "fedora30")
# Pick the right distro and bootstrap, default is fedora31
distro = (ENV['SPDK_VAGRANT_DISTRO'] || "fedora31")
provider = (ENV['SPDK_VAGRANT_PROVIDER'] || "virtualbox")
# Get all variables for creating vm

20
scripts/vagrant/create_vbox.sh
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>] [-hvrldcu] <distro>"
echo
echo " distro = <centos7 | centos8| ubuntu1604 | ubuntu1804 | ubuntu2004 | fedora30 |"
echo " fedora31 | fedora32 | freebsd11 | freebsd12 | arch | clearlinux>"
echo " distro = <centos7 | centos8| ubuntu1604 | ubuntu1804 | ubuntu2004 |"
echo " fedora31 | fedora32 | fedora33 | 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}"
@ -49,13 +49,13 @@ display_help() {
echo
echo " Examples:"
echo
echo " $0 -x http://user:password@host:port fedora30"
echo " $0 -x http://user:password@host:port fedora33"
echo " $0 -s 2048 -n 2 ubuntu16"
echo " $0 -rv freebsd"
echo " $0 fedora30"
echo " $0 -b /var/lib/libvirt/images/nvme1.img,nvme,1 fedora30"
echo " $0 -b /var/lib/libvirt/images/ocssd.img,ocssd fedora30"
echo " $0 -b /var/lib/libvirt/images/nvme5.img,nvme,5 -b /var/lib/libvirt/images/ocssd.img,ocssd fedora30"
echo " $0 fedora33"
echo " $0 -b /var/lib/libvirt/images/nvme1.img,nvme,1 fedora33"
echo " $0 -b /var/lib/libvirt/images/ocssd.img,ocssd fedora33"
echo " $0 -b /var/lib/libvirt/images/nvme5.img,nvme,5 -b /var/lib/libvirt/images/ocssd.img,ocssd fedora33"
echo
}
@ -173,15 +173,15 @@ case "${SPDK_VAGRANT_DISTRO}" in
ubuntu2004)
export SPDK_VAGRANT_DISTRO
;;
fedora30)
export SPDK_VAGRANT_DISTRO
;;
fedora31)
export SPDK_VAGRANT_DISTRO
;;
fedora32)
export SPDK_VAGRANT_DISTRO
;;
fedora33)
export SPDK_VAGRANT_DISTRO
;;
freebsd11)
export SPDK_VAGRANT_DISTRO
;;