feat(bootstrap): Add Noble and Hugo 71/41471/2
authorpmikus <peter.mikus@protonmail.ch>
Fri, 23 Aug 2024 05:27:57 +0000 (07:27 +0200)
committerPeter Mikus <peter.mikus@protonmail.ch>
Fri, 23 Aug 2024 05:29:31 +0000 (05:29 +0000)
Signed-off-by: pmikus <peter.mikus@protonmail.ch>
Change-Id: Ib8f34293a984b63437884440d3244c177d757bc4

VPP_DEVICE_IMAGE_UBUNTU_NOBLE [new file with mode: 0644]
VPP_DEVICE_IMAGE_UBUNTU_NOBLE_ARM [new file with mode: 0644]
VPP_STABLE_VER_UBUNTU_NOBLE [new file with mode: 0644]
resources/libraries/bash/function/common.sh
resources/libraries/bash/function/hugo.sh

diff --git a/VPP_DEVICE_IMAGE_UBUNTU_NOBLE b/VPP_DEVICE_IMAGE_UBUNTU_NOBLE
new file mode 100644 (file)
index 0000000..72d2712
--- /dev/null
@@ -0,0 +1 @@
+csit_sut-ubuntu2404:local
\ No newline at end of file
diff --git a/VPP_DEVICE_IMAGE_UBUNTU_NOBLE_ARM b/VPP_DEVICE_IMAGE_UBUNTU_NOBLE_ARM
new file mode 100644 (file)
index 0000000..fcc3f1e
--- /dev/null
@@ -0,0 +1 @@
+csit_sut-ubuntu2404:local
diff --git a/VPP_STABLE_VER_UBUNTU_NOBLE b/VPP_STABLE_VER_UBUNTU_NOBLE
new file mode 100644 (file)
index 0000000..e69de29
index c063686..5aa4f06 100644 (file)
@@ -119,9 +119,9 @@ function activate_virtualenv () {
     env_dir="${root_path}/env"
     req_path=${2-$CSIT_DIR/requirements.txt}
     rm -rf "${env_dir}" || die "Failed to clean previous virtualenv."
-    pip3 install virtualenv==20.26.3 || {
-        die "Virtualenv package install failed."
-    }
+    #pip3 install virtualenv==20.26.3 || {
+    #    die "Virtualenv package install failed."
+    #}
     virtualenv --no-download --python=$(which python3) "${env_dir}" || {
         die "Virtualenv creation for $(which python3) failed."
     }
@@ -875,6 +875,11 @@ function select_arch_os () {
                     VPP_VER_FILE="VPP_STABLE_VER_UBUNTU_JAMMY"
                     PKG_SUFFIX="deb"
                     ;;
+                *"LTS (Noble Numbat)"*)
+                    IMAGE_VER_FILE="VPP_DEVICE_IMAGE_UBUNTU_NOBLE"
+                    VPP_VER_FILE="VPP_STABLE_VER_UBUNTU_NOBLE"
+                    PKG_SUFFIX="deb"
+                    ;;
                 *)
                     die "Unsupported Ubuntu version!"
                     ;;
index 52a6d0a..ba5591b 100644 (file)
@@ -92,7 +92,7 @@ function hugo_install () {
     hugo_url="https://github.com/gohugoio/hugo/releases/download"
     hugo_link="${hugo_url}/${hugo_version}"
     wget -O "hugo.deb" "${hugo_link}" || die "Failed to install Hugo!"
-    dpkg -i "hugo.deb" || die "Failed to install Hugo!"
+    sudo dpkg -i "hugo.deb" || die "Failed to install Hugo!"
     rm "hugo.deb" || die "Failed to install Hugo!"
 }