From: Elod Illes <elod.illes@est.tech>
Date: Thu, 21 Mar 2024 14:12:59 +0000 (+0100)
Subject: docs: Use newer Ubuntu LTS in tutorial
X-Git-Tag: v24.10-rc0~22
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=078a3607c3f4f8fa138b60f2a59fbe55c074176c;p=vpp.git

docs: Use newer Ubuntu LTS in tutorial

The tutorial uses old 18.04 Bionic Ubuntu release, and tries to
install vpp from packagecloud.io's bionic repository which does not
exist. However newer ubuntu releases' repositories exist, so let's
update to newer Ubuntu LTS version: 22.04 Jammy.

Also, the ubuntu vagrant box is old, so let's replace it to a newer,
generic/ubuntu2204, which uses libvirt provider (instead of virtualbox)
and updated frequently, works well for the tutorial. Due to using
libvirt provider, there is no need to customize the VM as those
customizations are present in the box by default.

The truested=yes part is removed from the apt source list command, as
we add gpgkey anyway, thus, no need for this.

Tutorial and vpp build tested with this new box and looks to be working
fine.

Type: docs
Signed-off-by: Elod Illes <elod.illes@est.tech>
Change-Id: Idcff693240fc6a1496a240e0d07c5ed43fe833e9
---

diff --git a/docs/gettingstarted/progressivevpp/index.rst b/docs/gettingstarted/progressivevpp/index.rst
index 7d1a2e2b237..efe31b12db5 100644
--- a/docs/gettingstarted/progressivevpp/index.rst
+++ b/docs/gettingstarted/progressivevpp/index.rst
@@ -6,7 +6,7 @@
 Progressive VPP Tutorial
 ########################
 
-Learn to run FD.io VPP on a single Ubuntu 16.04 VM using Vagrant with this walkthrough
+Learn to run FD.io VPP on a single Ubuntu VM using Vagrant with this walkthrough
 covering basic FD.io VPP scenarios. Useful FD.io VPP commands will be used, and
 will discuss basic operations, and the state of a running FD.io VPP on a system.
 
diff --git a/docs/gettingstarted/progressivevpp/settingupenvironment.rst b/docs/gettingstarted/progressivevpp/settingupenvironment.rst
index 8c67c79b188..a8fe16aa4ce 100644
--- a/docs/gettingstarted/progressivevpp/settingupenvironment.rst
+++ b/docs/gettingstarted/progressivevpp/settingupenvironment.rst
@@ -3,15 +3,15 @@
 Setting up your environment
 ===========================
 
-All of these exercises are designed to be performed on an Ubuntu 16.04 (Xenial) box.
+All of these exercises are designed to be performed on an Ubuntu 22.04 (Jammy) box.
 
-* If you have an Ubuntu 18.04 box on which you have sudo or root access, you can feel free to use that.
-* If you do not, a Vagrantfile is provided to setup a basic Ubuntu 18.04 box for you in the the steps below.
+* If you have an Ubuntu 22.04 box on which you have sudo or root access, you can feel free to use that.
+* If you do not, a Vagrantfile is provided to setup a basic Ubuntu 22.04 box for you in the the steps below.
 
-Install Virtual Box and Vagrant
+Install Libvirt and Vagrant
 -------------------------------
 
-You will need to install Virtual Box and Vagrant.
+You will need to install Libvirt and Vagrant.
 
 Create a Vagrant Directory
 ---------------------------
@@ -32,21 +32,16 @@ Create a file called **Vagrantfile** with the following contents:
 
     Vagrant.configure(2) do |config|
 
-      config.vm.box = "bento/ubuntu-18.04"
-      config.vm.box_check_update = false
+      config.vm.box = "generic/ubuntu2204"
 
       vmcpu=(ENV['VPP_VAGRANT_VMCPU'] || 2)
       vmram=(ENV['VPP_VAGRANT_VMRAM'] || 4096)
 
       config.ssh.forward_agent = true
 
-      config.vm.provider "virtualbox" do |vb|
-          vb.customize ["modifyvm", :id, "--ioapic", "on"]
+      config.vm.provider "libvirt" do |vb|
           vb.memory = "#{vmram}"
           vb.cpus = "#{vmcpu}"
-          #support for the SSE4.x instruction is required in some versions of VB.
-          vb.customize ["setextradata", :id, "VBoxInternal/CPUM/SSE4.1", "1"]
-          vb.customize ["setextradata", :id, "VBoxInternal/CPUM/SSE4.2", "1"]
       end
     end
 
@@ -97,7 +92,7 @@ We write this file with the following contents:
 .. code-block:: console
 
    $ sudo bash
-   # echo "deb [trusted=yes] https://packagecloud.io/fdio/release/ubuntu bionic main" > /etc/apt/sources.list.d/99fd.io.list
+   # echo "deb https://packagecloud.io/fdio/release/ubuntu jammy main" > /etc/apt/sources.list.d/99fd.io.list
    #
 
 Get the key.