From 400aadf83f642a88ccee358411e52f6642bce89a Mon Sep 17 00:00:00 2001 From: Jaroslaw Chachulski Date: Thu, 9 Jun 2022 05:03:05 -0400 Subject: [PATCH] scripts/vagrant: Add ubuntu 22.04 lts support. Add support for ubuntu 22.04 lts. Signed-off-by: Jaroslaw Chachulski Change-Id: I6f598bbf1961c8266620acb69a388e94ed794d8f Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12988 Community-CI: Broadcom CI Reviewed-by: Konrad Sztyber Reviewed-by: Tomasz Zawadzki Tested-by: SPDK CI Jenkins --- scripts/vagrant/Vagrantfile | 1 + scripts/vagrant/create_vbox.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/vagrant/Vagrantfile b/scripts/vagrant/Vagrantfile index db98eb923..a5628cb65 100644 --- a/scripts/vagrant/Vagrantfile +++ b/scripts/vagrant/Vagrantfile @@ -13,6 +13,7 @@ def get_box_type(distro, force_distro) 'ubuntu1604' => 'peru/ubuntu-16.04-server-amd64', 'ubuntu1804' => 'peru/ubuntu-18.04-server-amd64', 'ubuntu2004' => 'peru/ubuntu-20.04-server-amd64', + 'ubuntu2204' => 'generic/ubuntu2204', 'fedora33' => 'generic/fedora33', 'fedora34' => 'generic/fedora34', 'fedora35' => 'generic/fedora35', diff --git a/scripts/vagrant/create_vbox.sh b/scripts/vagrant/create_vbox.sh index b428354bf..242bed981 100755 --- a/scripts/vagrant/create_vbox.sh +++ b/scripts/vagrant/create_vbox.sh @@ -19,7 +19,7 @@ display_help() { echo echo " Usage: ${0##*/} [-b nvme-backing-file] [-n ] [-s ] [-x ] [-hvrldcufaoH] " echo - echo " distro = " echo echo " -s in MB Default: ${SPDK_VAGRANT_VMRAM}" @@ -169,7 +169,7 @@ SPDK_VAGRANT_DISTRO="$*" case "${SPDK_VAGRANT_DISTRO}" in centos[78]) ;& - ubuntu1[68]04 | ubuntu2004) ;& + ubuntu1[68]04 | ubuntu2[02]04) ;& fedora3[3-6]) ;& freebsd1[12]) ;& rocky8) ;&