From: Michal Cmarada Date: Wed, 17 Apr 2019 10:41:37 +0000 (+0200) Subject: Fix JVPP stable branch builds X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=8745da5da26eb9f74110ff776f5e8e91de2da553;p=ci-management.git Fix JVPP stable branch builds Change-Id: I95d0d6dd529c596e7fad413e234155c6bd953d0d Signed-off-by: Michal Cmarada --- diff --git a/jjb/scripts/setup_jvpp_dev_env.sh b/jjb/scripts/setup_jvpp_dev_env.sh index 8ef360869..f519dcb7b 100644 --- a/jjb/scripts/setup_jvpp_dev_env.sh +++ b/jjb/scripts/setup_jvpp_dev_env.sh @@ -23,6 +23,10 @@ function setup { echo "REPO_URL: ${REPO_URL}" # Setup by installing vpp-dev and vpp-lib if [[ "$DISTRIB_ID" == "Ubuntu" ]]; then + if ! [[ "${STREAM}" == "master" ]]; then + echo "stable branch - clearing all fdio repos. new one will be installed." + sudo rm -f /etc/apt/sources.list.d/fdio_*.list + fi if [[ -f /etc/apt/sources.list.d/99fd.io.list ]];then echo "Deleting: /etc/apt/sources.list.d/99fd.io.list" sudo rm /etc/apt/sources.list.d/99fd.io.list