scripts/vagrant: update boxes list
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:
parent
4033c66071
commit
1502112764
16
scripts/vagrant/Vagrantfile
vendored
16
scripts/vagrant/Vagrantfile
vendored
@ -3,8 +3,8 @@
|
|||||||
|
|
||||||
Vagrant.configure(2) do |config|
|
Vagrant.configure(2) do |config|
|
||||||
|
|
||||||
# Pick the right distro and bootstrap, default is fedora28
|
# Pick the right distro and bootstrap, default is fedora30
|
||||||
distro = ( ENV['SPDK_VAGRANT_DISTRO'] || "fedora28")
|
distro = ( ENV['SPDK_VAGRANT_DISTRO'] || "fedora30")
|
||||||
provider = (ENV['SPDK_VAGRANT_PROVIDER'] || "virtualbox")
|
provider = (ENV['SPDK_VAGRANT_PROVIDER'] || "virtualbox")
|
||||||
case distro
|
case distro
|
||||||
when "centos7"
|
when "centos7"
|
||||||
@ -14,6 +14,9 @@ Vagrant.configure(2) do |config|
|
|||||||
config.vm.provider :libvirt do |libvirt|
|
config.vm.provider :libvirt do |libvirt|
|
||||||
config.vm.box = "centos/7"
|
config.vm.box = "centos/7"
|
||||||
end if Vagrant.has_plugin?('vagrant-libvirt')
|
end if Vagrant.has_plugin?('vagrant-libvirt')
|
||||||
|
when "centos8"
|
||||||
|
# See: https://app.vagrantup.com/generic/boxes/centos8
|
||||||
|
config.vm.box = "generic/centos8"
|
||||||
when "ubuntu16"
|
when "ubuntu16"
|
||||||
if provider.eql?("libvirt")
|
if provider.eql?("libvirt")
|
||||||
# https://app.vagrantup.com/sjohnsen/boxes/ubuntu1604
|
# 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 = "bento/ubuntu-18.04"
|
||||||
config.vm.box_version = "201803.24.0"
|
config.vm.box_version = "201803.24.0"
|
||||||
end
|
end
|
||||||
when "fedora28"
|
|
||||||
#See: https://app.vagrantup.com/generic/boxes/fedora28
|
|
||||||
config.vm.box = "generic/fedora28"
|
|
||||||
when "fedora29"
|
when "fedora29"
|
||||||
#See: https://app.vagrantup.com/generic/boxes/fedora29
|
#See: https://app.vagrantup.com/generic/boxes/fedora29
|
||||||
config.vm.box = "generic/fedora29"
|
config.vm.box = "generic/fedora29"
|
||||||
when "fedora30"
|
when "fedora30"
|
||||||
#See: https://app.vagrantup.com/generic/boxes/fedora30
|
#See: https://app.vagrantup.com/generic/boxes/fedora30
|
||||||
config.vm.box = "generic/fedora30"
|
config.vm.box = "generic/fedora30"
|
||||||
|
when "fedora31"
|
||||||
|
#See: https://app.vagrantup.com/generic/boxes/fedora31
|
||||||
|
config.vm.box = "generic/fedora31"
|
||||||
when "freebsd11"
|
when "freebsd11"
|
||||||
#See: https://app.vagrantup.com/generic/boxes/freebsd11
|
#See: https://app.vagrantup.com/generic/boxes/freebsd11
|
||||||
config.vm.box = "generic/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 chown root:wheel /usr/local/etc/pkg.conf"
|
||||||
config.vm.provision "shell", inline: "sudo chmod 644 /usr/local/etc/pkg.conf"
|
config.vm.provision "shell", inline: "sudo chmod 644 /usr/local/etc/pkg.conf"
|
||||||
end
|
end
|
||||||
|
when "freebsd12"
|
||||||
|
#See: https://app.vagrantup.com/generic/boxes/freebsd12
|
||||||
|
config.vm.box = "generic/freebsd12"
|
||||||
when "arch-linux"
|
when "arch-linux"
|
||||||
#See: https://app.vagrantup.com/generic/boxes/arch
|
#See: https://app.vagrantup.com/generic/boxes/arch
|
||||||
config.vm.box = "generic/arch"
|
config.vm.box = "generic/arch"
|
||||||
|
@ -17,7 +17,8 @@ display_help() {
|
|||||||
echo
|
echo
|
||||||
echo " Usage: ${0##*/} [-b nvme-backing-file] [-n <num-cpus>] [-s <ram-size>] [-x <http-proxy>] [-hvrld] <distro>"
|
echo " Usage: ${0##*/} [-b nvme-backing-file] [-n <num-cpus>] [-s <ram-size>] [-x <http-proxy>] [-hvrld] <distro>"
|
||||||
echo
|
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
|
||||||
echo " -b <nvme-backing-file> nvme file path with name"
|
echo " -b <nvme-backing-file> nvme file path with name"
|
||||||
echo " type of emulated nvme disk"
|
echo " type of emulated nvme disk"
|
||||||
@ -42,10 +43,10 @@ display_help() {
|
|||||||
echo
|
echo
|
||||||
echo " Examples:"
|
echo " Examples:"
|
||||||
echo
|
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 -s 2048 -n 2 ubuntu16"
|
||||||
echo " $0 -rv freebsd"
|
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/nvme1.img,nvme,1 fedora30"
|
||||||
echo " $0 -b /var/lib/libvirt/images/ocssd.img,ocssd 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 -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)
|
centos7)
|
||||||
export SPDK_VAGRANT_DISTRO
|
export SPDK_VAGRANT_DISTRO
|
||||||
;;
|
;;
|
||||||
|
centos8)
|
||||||
|
export SPDK_VAGRANT_DISTRO
|
||||||
|
;;
|
||||||
ubuntu16)
|
ubuntu16)
|
||||||
export SPDK_VAGRANT_DISTRO
|
export SPDK_VAGRANT_DISTRO
|
||||||
;;
|
;;
|
||||||
ubuntu18)
|
ubuntu18)
|
||||||
export SPDK_VAGRANT_DISTRO
|
export SPDK_VAGRANT_DISTRO
|
||||||
;;
|
;;
|
||||||
fedora28)
|
|
||||||
export SPDK_VAGRANT_DISTRO
|
|
||||||
;;
|
|
||||||
fedora29)
|
fedora29)
|
||||||
export SPDK_VAGRANT_DISTRO
|
export SPDK_VAGRANT_DISTRO
|
||||||
;;
|
;;
|
||||||
fedora30)
|
fedora30)
|
||||||
export SPDK_VAGRANT_DISTRO
|
export SPDK_VAGRANT_DISTRO
|
||||||
;;
|
;;
|
||||||
|
fedora31)
|
||||||
|
export SPDK_VAGRANT_DISTRO
|
||||||
|
;;
|
||||||
freebsd11)
|
freebsd11)
|
||||||
export SPDK_VAGRANT_DISTRO
|
export SPDK_VAGRANT_DISTRO
|
||||||
;;
|
;;
|
||||||
|
freebsd12)
|
||||||
|
export SPDK_VAGRANT_DISTRO
|
||||||
|
;;
|
||||||
arch-linux)
|
arch-linux)
|
||||||
export SPDK_VAGRANT_DISTRO
|
export SPDK_VAGRANT_DISTRO
|
||||||
;;
|
;;
|
||||||
|
Loading…
Reference in New Issue
Block a user