Commit 55de68f1 authored by Maciej Wawryk's avatar Maciej Wawryk Committed by Tomasz Zawadzki
Browse files

scripts/vagrant: Add ubuntu 20.04 into vagrant setup scripts 



Fixes issue #1680.

Signed-off-by: default avatarMaciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: I6a7c1c2ba2f72c82cec10c7a46207ab528c22d2b
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5109


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarPawel Piatek <pawelx.piatek@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 19242211

scripts/vagrant/Vagrantfile

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ def get_box_type(distro) 
    'centos8'    => 'centos/8',

    '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',

scripts/vagrant/create_vbox.sh

+4 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 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 | fedora30 |"

	echo "  distro = <centos7 | centos8| ubuntu1604 | ubuntu1804 | ubuntu2004 | fedora30 |"

	echo "            fedora31 | fedora32 | freebsd11 | freebsd12 | arch | clearlinux>"

	echo

	echo "  -s <ram-size> in MB             Default: ${SPDK_VAGRANT_VMRAM}"
@@ -170,6 +170,9 @@ case "${SPDK_VAGRANT_DISTRO}" in 
	ubuntu1804)

		export SPDK_VAGRANT_DISTRO

		;;

	ubuntu2004)

		export SPDK_VAGRANT_DISTRO

		;;

	fedora30)

		export SPDK_VAGRANT_DISTRO

		;;