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

scripts/vagrant: update boxes list

Browse Source 
Update VM boxes list.

- Remove Fedora 28 as it is obsolete since May 2018
- Add Fedora 31
- Add CentOS 8
- Add FreeBSD 12
- Make Fedora 30 a default box selection

Change-Id: I006f49e1e596ed61926777e6ae26d9bedea1fac3
Signed-off-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/476158
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Maciej Wawryk <maciejx.wawryk@intel.com>
Reviewed-by: yidong0635 <dongx.yi@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Karol Latecki 2019-11-29 11:26:50 +01:00 committed by Tomasz Zawadzki
parent 4033c66071
commit 1502112764
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/vagrant/Vagrantfile vendored
View File

@ -3,8 +3,8 @@
Vagrant.configure(2) do |config|
# Pick the right distro and bootstrap, default is fedora28
distro = ( ENV['SPDK_VAGRANT_DISTRO'] || "fedora28")
# 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"
@ -14,6 +14,9 @@ Vagrant.configure(2) do |config|
config.vm.provider :libvirt do |libvirt|
config.vm.box = "centos/7"
end if Vagrant.has_plugin?('vagrant-libvirt')
when "centos8"
# See: https://app.vagrantup.com/generic/boxes/centos8
config.vm.box = "generic/centos8"
when "ubuntu16"
if provider.eql?("libvirt")
# https://app.vagrantup.com/sjohnsen/boxes/ubuntu1604
@ -32,15 +35,15 @@ Vagrant.configure(2) do |config|
config.vm.box = "bento/ubuntu-18.04"
config.vm.box_version = "201803.24.0"
end
when "fedora28"
#See: https://app.vagrantup.com/generic/boxes/fedora28
config.vm.box = "generic/fedora28"
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"
@ -50,6 +53,9 @@ Vagrant.configure(2) do |config|
config.vm.provision "shell", inline: "sudo chown root:wheel /usr/local/etc/pkg.conf"
config.vm.provision "shell", inline: "sudo chmod 644 /usr/local/etc/pkg.conf"
end
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"

19
scripts/vagrant/create_vbox.sh
View File

@ -17,7 +17,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 | ubuntu16 | ubuntu18 | fedora28 | fedora29 | fedora 30 | freebsd11> "
echo " distro = <centos7 | centos8| ubuntu16 | ubuntu18 |"
echo " fedora29 | fedora 30 | fedora 31 | freebsd11 | freebsd12>"
echo
echo " -b <nvme-backing-file> nvme file path with name"
echo " type of emulated nvme disk"
@ -42,10 +43,10 @@ display_help() {
echo
echo " Examples:"
echo
echo " $0 -x http://user:password@host:port fedora28"
echo " $0 -x http://user:password@host:port fedora30"
echo " $0 -s 2048 -n 2 ubuntu16"
echo " $0 -rv freebsd"
echo " $0 fedora28"
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"
@ -136,24 +137,30 @@ case "${SPDK_VAGRANT_DISTRO}" in
centos7)
export SPDK_VAGRANT_DISTRO
;;
centos8)
export SPDK_VAGRANT_DISTRO
;;
ubuntu16)
export SPDK_VAGRANT_DISTRO
;;
ubuntu18)
export SPDK_VAGRANT_DISTRO
;;
fedora28)
export SPDK_VAGRANT_DISTRO
;;
fedora29)
export SPDK_VAGRANT_DISTRO
;;
fedora30)
export SPDK_VAGRANT_DISTRO
;;
fedora31)
export SPDK_VAGRANT_DISTRO
;;
freebsd11)
export SPDK_VAGRANT_DISTRO
;;
freebsd12)
export SPDK_VAGRANT_DISTRO
;;
arch-linux)
export SPDK_VAGRANT_DISTRO
;;