Commit 0c939301 authored by Karol Latecki's avatar Karol Latecki Committed by Ben Walker
Browse files

scripts/Vagrant: update vagrant boxes



Removing Fedora 26 and 27 which are long past their EOL date.
Adding Fedora 29 and 30.

Change-Id: I35bc8b7a5ac693b7a5af0e6abb35869b18ed5777
Signed-off-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/457924


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avataryidong0635 <dongx.yi@intel.com>
Reviewed-by: default avatarPawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 29093c7f
Loading
Loading
Loading
Loading
+8 −8
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@

Vagrant.configure(2) do |config|

  # Pick the right distro and bootstrap, default is fedora26
  distro = ( ENV['SPDK_VAGRANT_DISTRO'] || "fedora26")
  # Pick the right distro and bootstrap, default is fedora28
  distro = ( ENV['SPDK_VAGRANT_DISTRO'] || "fedora28")
  provider = (ENV['SPDK_VAGRANT_PROVIDER'] || "virtualbox")
  case distro
  when "centos7"
@@ -32,15 +32,15 @@ Vagrant.configure(2) do |config|
      config.vm.box = "bento/ubuntu-18.04"
      config.vm.box_version = "201803.24.0"
    end
  when "fedora26"
    #See: https://app.vagrantup.com/generic/boxes/fedora2
    config.vm.box = "generic/fedora26"
  when "fedora27"
    #See: https://app.vagrantup.com/generic/boxes/fedora27
    config.vm.box = "generic/fedora27"
  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 "freebsd11"
    #See: https://app.vagrantup.com/generic/boxes/freebsd11
    config.vm.box = "generic/freebsd11"
+6 −6
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 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 | fedora26 | fedora27 | freebsd11> "
	echo "  distro = <centos7 | ubuntu16 | ubuntu18 | fedora28 | fedora29 | fedora 30 | freebsd11> "
	echo
	echo "  -b <nvme-backing-file>    default: ${NVME_FILE}"
	echo "  -s <ram-size> in kb       default: ${SPDK_VAGRANT_VMRAM}"
@@ -35,10 +35,10 @@ display_help() {
	echo
	echo " Examples:"
	echo
	echo "  $0 -x http://user:password@host:port fedora27"
	echo "  $0 -x http://user:password@host:port fedora28"
	echo "  $0 -s 2048 -n 2 ubuntu16"
	echo "  $0 -rv freebsd"
	echo "  $0 fedora26 "
	echo "  $0 fedora28 "
	echo
}

@@ -122,13 +122,13 @@ case "$SPDK_VAGRANT_DISTRO" in
	ubuntu18)
		export SPDK_VAGRANT_DISTRO
	;;
	fedora26)
	fedora28)
		export SPDK_VAGRANT_DISTRO
	;;
	fedora27)
	fedora29)
		export SPDK_VAGRANT_DISTRO
	;;
	fedora28)
	fedora30)
		export SPDK_VAGRANT_DISTRO
	;;
	freebsd11)