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

scripts/vagrant: Unified distribution names in Vagrantfile and create_vbox.sh

Browse Source 
Remove unnecessary case statement in Vagrantfile

Signed-off-by: Maciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: I6aa5d0650d268851ee5af73ffc2aa54d9396fec5
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/834
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Maciej Wawryk 2020-02-12 13:44:35 +01:00 committed by Tomasz Zawadzki
parent 22310f6176
commit dd9a88cc7f
2 changed files with 6 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
scripts/vagrant/Vagrantfile vendored
View File

@ -6,41 +6,7 @@ Vagrant.configure(2) do |config|
# Pick the right distro and bootstrap, default is fedora30
distro = ( ENV['SPDK_VAGRANT_DISTRO'] || "fedora30")
provider = (ENV['SPDK_VAGRANT_PROVIDER'] || "virtualbox")
case distro
when "centos7"
# See: https://app.vagrantup.com/generic/boxes/centos7
config.vm.box = "generic/centos7"
when "centos8"
# See: https://app.vagrantup.com/generic/boxes/centos8
config.vm.box = "generic/centos8"
when "ubuntu16"
#See: https://app.vagrantup.com/generic/boxes/ubuntu1604
config.vm.box = "generic/ubuntu1604"
when "ubuntu18"
#See: https://app.vagrantup.com/generic/boxes/ubuntu1804
config.vm.box = "generic/ubuntu1804"
when "fedora29"
#See: https://app.vagrantup.com/generic/boxes/fedora29
config.vm.box = "generic/fedora29"
when "fedora30"
#See: https://app.vagrantup.com/generic/boxes/fedora30
config.vm.box = "generic/fedora30"
when "fedora31"
#See: https://app.vagrantup.com/generic/boxes/fedora31
config.vm.box = "generic/fedora31"
when "freebsd11"
#See: https://app.vagrantup.com/generic/boxes/freebsd11
config.vm.box = "generic/freebsd11"
when "freebsd12"
#See: https://app.vagrantup.com/generic/boxes/freebsd12
config.vm.box = "generic/freebsd12"
when "arch-linux"
#See: https://app.vagrantup.com/generic/boxes/arch
config.vm.box = "generic/arch"
else
"Invalid argument #{distro}"
abort("Invalid argument!")
end
config.vm.box = "generic/"+distro
config.vm.box_check_update = false
# Copy in the .gitconfig if it exists

10
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>] [-hvrld] <distro>"
echo
echo " distro = <centos7 | centos8| ubuntu16 | ubuntu18 |"
echo " fedora29 | fedora 30 | fedora 31 | freebsd11 | freebsd12>"
echo " distro = <centos7 | centos8| ubuntu1604 | ubuntu1804 |"
echo " fedora29 | fedora30 | fedora 31 | freebsd11 | freebsd12 | arch>"
echo
echo " -b <nvme-backing-file> nvme file path with name"
echo " type of emulated nvme disk"
@ -150,10 +150,10 @@ case "${SPDK_VAGRANT_DISTRO}" in
centos8)
export SPDK_VAGRANT_DISTRO
;;
ubuntu16)
ubuntu1604)
export SPDK_VAGRANT_DISTRO
;;
ubuntu18)
ubuntu1804)
export SPDK_VAGRANT_DISTRO
;;
fedora29)
@ -171,7 +171,7 @@ case "${SPDK_VAGRANT_DISTRO}" in
freebsd12)
export SPDK_VAGRANT_DISTRO
;;
arch-linux)
arch)
export SPDK_VAGRANT_DISTRO
;;
*)