diff options
| author |   Ed Kern <ejk@cisco.com> | 2019-02-19 10:15:02 -0700 |
|---|---|---|
| committer | Ed Kern <ejk@cisco.com> | 2019-02-19 10:15:02 -0700 |
| commit | 5ef98a23a517c44fe5f60c640d10d9465f84048b (patch) | |
| tree | 423f60f203514bf265f839764e1f6122a1a6e711 /jjb | |
| parent | 602d267547559f074f3b23c7550750fbb00d7580 (diff) | |
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>
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/scripts/setup_vpp_dpdk_dev_env.sh | 13 | ||||
| -rw-r--r-- | jjb/scripts/setup_vpp_ubuntu_docker_test.sh | 6 |
2 files changed, 19 insertions, 0 deletions
diff --git a/jjb/scripts/setup_vpp_dpdk_dev_env.sh b/jjb/scripts/setup_vpp_dpdk_dev_env.sh index b40d7af68..c84bf8148 100644 --- a/jjb/scripts/setup_vpp_dpdk_dev_env.sh +++ b/jjb/scripts/setup_vpp_dpdk_dev_env.sh @@ -40,6 +40,19 @@ 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 + sudo yum -y install vpp-ext-deps || true fi fi } diff --git a/jjb/scripts/setup_vpp_ubuntu_docker_test.sh b/jjb/scripts/setup_vpp_ubuntu_docker_test.sh index 3c757578a..90257f1c0 100644 --- 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 |