Merge "docker: add support for vpp stable/2306 branch"

[ci-management.git] / jjb / scripts / setup_vpp_ubuntu_docker_test.sh

diff --git a/jjb/scripts/setup_vpp_ubuntu_docker_test.sh b/jjb/scripts/setup_vpp_ubuntu_docker_test.sh
old mode 100644 (file)
new mode 100755 (executable)
index 00d14c3..548ac56
--- a/jjb/scripts/setup_vpp_ubuntu_docker_test.sh
+++ b/jjb/scripts/setup_vpp_ubuntu_docker_test.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 ##############################################################################
-# Copyright (c) 2018 The Linux Foundation and others.
+# Copyright (c) 2021 The Linux Foundation and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
@@ -14,6 +14,7 @@ echo "---> jjb/scripts/setup_vpp_ubuntu_docker_test.sh"
 set -e -o pipefail
 
 OS_ID=$(grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
+OS_VERSION_ID=$(grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
 
 if [ -n ${DOCKER_TEST} ] ; then
         # for 4 cores:
@@ -29,17 +30,3 @@ if [ -n ${DOCKER_TEST} ] ; then
        sudo mount -o remount /dev/shm -o size=${MEM} || true
         echo "/dev/shm remounted with size='${MEM}'"
 fi
-
-# This will remove any previously installed external packages
-# for old branch builds
-if [ "${GERRIT_BRANCH}" != "master" ]; then
-    if [ "${OS_ID,,}" == "ubuntu" ] || [ "${OS_ID,,}" == "debian" ] ; then
-        [ -n "$(dpkg -l | grep vpp-ext-deps)" ] \
-            && sudo apt-get -y remove vpp-ext-deps
-    elif [ "${OS_ID,,}" == "centos" ]; then
-        sudo yum -y erase vpp-ext-deps || true
-        sudo yum clean all || true
-    else
-        echo "ERROR: Unsupported OS '$OS_ID'!"
-    fi
-fi