VPP: cover opensuse reporting difference

Cover opensuse leap-15 reporting as either opensuse
or opensuse-leap

Change-Id: I79c077ecff33e1473120a21b418a8af89b4a00d5
Signed-off-by: Ed Kern <ejk@cisco.com>

diff --git a/jjb/scripts/setup_vpp_dpdk_dev_env.sh b/jjb/scripts/setup_vpp_dpdk_dev_env.sh
index b40d7af..c84bf81 100644 (file)
--- a/jjb/scripts/setup_vpp_dpdk_dev_env.sh
+++ b/jjb/scripts/setup_vpp_dpdk_dev_env.sh
@@ -36,6 +36,19 @@ name=fd.io master branch latest merge
 baseurl=${REPO_URL}
 enabled=1
 gpgcheck=0
+EOF
+            sudo mv fdio-master.repo /etc/yum/repos.d/fdio-master.repo
+            sudo yum -y install vpp-dpdk-devel || true
+            sudo yum -y install vpp-ext-deps || true
+        elif [ "$OS_ID" == "opensuse-leap" ]; then
+            REPO_URL="${NEXUSPROXY}/content/repositories/fd.io.${REPO_NAME}"
+            echo "REPO_URL: ${REPO_URL}"
+            sudo cat << EOF > fdio-master.repo
+[fdio-master]
+name=fd.io master branch latest merge
+baseurl=${REPO_URL}
+enabled=1
+gpgcheck=0
 EOF
             sudo mv fdio-master.repo /etc/yum/repos.d/fdio-master.repo
             sudo yum -y install vpp-dpdk-devel || true

diff --git a/jjb/scripts/setup_vpp_ubuntu_docker_test.sh b/jjb/scripts/setup_vpp_ubuntu_docker_test.sh
index 3c75757..90257f1 100644 (file)
--- a/jjb/scripts/setup_vpp_ubuntu_docker_test.sh
+++ b/jjb/scripts/setup_vpp_ubuntu_docker_test.sh
@@ -43,6 +43,9 @@ elif [ "${OS_ID}" == "centos" ]; then
 elif [ "${OS_ID}" == "opensuse" ]; then
     yum list installed || true
     pip list || true
+elif [ "${OS_ID}" == "opensuse-leap" ]; then
+    yum list installed || true
+    pip list || true
 fi
 
 ##This will remove any previously installed dpdk for old branch builds
@@ -59,5 +62,8 @@ if [ "${GERRIT_BRANCH}" != "master" ]; then
     elif [ "${OS_ID}" == "opensuse" ]; then
         sudo yum -y erase vpp-dpdk-devel || true
         sudo yum -y erase vpp-ext-deps || true
+    elif [ "${OS_ID}" == "opensuse-leap" ]; then
+        sudo yum -y erase vpp-dpdk-devel || true
+        sudo yum -y erase vpp-ext-deps || true
     fi
 fi