diff options
| -rw-r--r-- | VPP_DEVICE_IMAGE_UBUNTU_NOBLE | 1 | ||||
| -rw-r--r-- | VPP_DEVICE_IMAGE_UBUNTU_NOBLE_ARM | 1 | ||||
| -rw-r--r-- | VPP_STABLE_VER_UBUNTU_NOBLE | 0 | ||||
| -rw-r--r-- | resources/libraries/bash/function/common.sh | 11 | ||||
| -rw-r--r-- | resources/libraries/bash/function/hugo.sh | 2 |
5 files changed, 11 insertions, 4 deletions
diff --git a/VPP_DEVICE_IMAGE_UBUNTU_NOBLE b/VPP_DEVICE_IMAGE_UBUNTU_NOBLE new file mode 100644 index 0000000000..72d27128b7 --- /dev/null +++ b/VPP_DEVICE_IMAGE_UBUNTU_NOBLE @@ -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 index 0000000000..fcc3f1e4e5 --- /dev/null +++ b/VPP_DEVICE_IMAGE_UBUNTU_NOBLE_ARM @@ -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 index 0000000000..e69de29bb2 --- /dev/null +++ b/VPP_STABLE_VER_UBUNTU_NOBLE diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index c063686a5e..5aa4f06b0e 100644 --- a/resources/libraries/bash/function/common.sh +++ b/resources/libraries/bash/function/common.sh @@ -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!" ;; diff --git a/resources/libraries/bash/function/hugo.sh b/resources/libraries/bash/function/hugo.sh index 52a6d0afaf..ba5591b72e 100644 --- a/resources/libraries/bash/function/hugo.sh +++ b/resources/libraries/bash/function/hugo.sh @@ -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!" } |