aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Gelety <jgelety@cisco.com>2017-10-11 16:54:05 +0200
committerJan Gelety <jgelety@cisco.com>2017-10-12 08:21:51 +0000
commit4d91cbdac72a79ac98394416c2eceaaee3c8122d (patch)
tree2ec1bd28b1417cd07f5f0ca90444373f94ddc550
parent3d7189ccea0ace9e14855662625c4d0546ac6200 (diff)
Set correct paths to vpp stable/1710 and use vpp stable/1710 builds
- do not use vpp-debuginfo rpm package as it is not available on Nexus for vpp stable/1710 Change-Id: I756bb238fc2ee568c1bc2d8700f904e6b6a6ca6d Signed-off-by: Jan Gelety <jgelety@cisco.com>
-rw-r--r--VPP_REPO_URL_CENTOS2
-rw-r--r--VPP_REPO_URL_UBUNTU2
-rw-r--r--VPP_STABLE_VER_CENTOS2
-rw-r--r--VPP_STABLE_VER_UBUNTU2
-rw-r--r--bootstrap-vpp-verify-weekly.sh2
-rwxr-xr-xbootstrap.sh2
-rwxr-xr-xresources/tools/scripts/download_hc_build_pkgs.sh2
-rwxr-xr-xresources/tools/scripts/download_hc_pkgs.sh2
-rwxr-xr-xresources/tools/scripts/download_install_vpp_pkgs.sh2
-rw-r--r--resources/tools/scripts/download_install_vpp_rpms.sh2
10 files changed, 10 insertions, 10 deletions
diff --git a/VPP_REPO_URL_CENTOS b/VPP_REPO_URL_CENTOS
index bc11e8d2a1..ac8a0ac851 100644
--- a/VPP_REPO_URL_CENTOS
+++ b/VPP_REPO_URL_CENTOS
@@ -1 +1 @@
-https://nexus.fd.io/content/repositories/fd.io.master.centos7/io/fd/vpp/
+https://nexus.fd.io/content/repositories/fd.io.stable.1710.centos7/io/fd/vpp/ \ No newline at end of file
diff --git a/VPP_REPO_URL_UBUNTU b/VPP_REPO_URL_UBUNTU
index 56de6b69e9..0bc3096d96 100644
--- a/VPP_REPO_URL_UBUNTU
+++ b/VPP_REPO_URL_UBUNTU
@@ -1 +1 @@
-https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/
+https://nexus.fd.io/content/repositories/fd.io.stable.1710.ubuntu.xenial.main/io/fd/vpp/ \ No newline at end of file
diff --git a/VPP_STABLE_VER_CENTOS b/VPP_STABLE_VER_CENTOS
index df7a878faa..792adb5a26 100644
--- a/VPP_STABLE_VER_CENTOS
+++ b/VPP_STABLE_VER_CENTOS
@@ -1 +1 @@
-17.10-rc0~334_gce41a5c~b2867.x86_64 \ No newline at end of file
+17.10-rc1~23_g87f1411~b28.x86_64 \ No newline at end of file
diff --git a/VPP_STABLE_VER_UBUNTU b/VPP_STABLE_VER_UBUNTU
index a0b7161937..92f6a08346 100644
--- a/VPP_STABLE_VER_UBUNTU
+++ b/VPP_STABLE_VER_UBUNTU
@@ -1 +1 @@
-17.10-rc0~334-gce41a5c~b2870_amd64 \ No newline at end of file
+17.10-rc1~23-g87f1411~b27_amd64 \ No newline at end of file
diff --git a/bootstrap-vpp-verify-weekly.sh b/bootstrap-vpp-verify-weekly.sh
index ecd0f158e8..9ae7767510 100644
--- a/bootstrap-vpp-verify-weekly.sh
+++ b/bootstrap-vpp-verify-weekly.sh
@@ -119,7 +119,7 @@ done
# Temporarily download VPP and DPDK packages from nexus.fd.io
case "$DISTRO" in
CENTOS )
- VPP_ARTIFACTS="vpp vpp-debuginfo vpp-devel vpp-lib vpp-plugins"
+ VPP_ARTIFACTS="vpp vpp-devel vpp-lib vpp-plugins"
DPDK_ARTIFACTS=""
PACKAGE="rpm"
VPP_CLASSIFIER=""
diff --git a/bootstrap.sh b/bootstrap.sh
index 54d6ff7ba3..ebbe752a4e 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -23,7 +23,7 @@ export PYTHONPATH=${SCRIPT_DIR}
if [ -f "/etc/redhat-release" ]; then
DISTRO="CENTOS"
sudo yum install -y python-devel python-virtualenv
- VPP_ARTIFACTS="vpp vpp-debuginfo vpp-devel vpp-lib vpp-plugins"
+ VPP_ARTIFACTS="vpp vpp-devel vpp-lib vpp-plugins"
DPDK_ARTIFACTS=""
PACKAGE="rpm"
VPP_CLASSIFIER=""
diff --git a/resources/tools/scripts/download_hc_build_pkgs.sh b/resources/tools/scripts/download_hc_build_pkgs.sh
index 6683499956..858f50212f 100755
--- a/resources/tools/scripts/download_hc_build_pkgs.sh
+++ b/resources/tools/scripts/download_hc_build_pkgs.sh
@@ -39,7 +39,7 @@ elif [ "${OS}" == "centos7" ]; then
OS="centos7"
PACKAGE="rpm rpm.md5"
CLASS=""
- VPP_ARTIFACTS="vpp vpp-debuginfo vpp-devel vpp-lib vpp-plugins vpp-api-java"
+ VPP_ARTIFACTS="vpp vpp-devel vpp-lib vpp-plugins vpp-api-java"
fi
REPO="fd.io.${STREAM}.${OS}"
diff --git a/resources/tools/scripts/download_hc_pkgs.sh b/resources/tools/scripts/download_hc_pkgs.sh
index 1bda02505c..446d35a1e0 100755
--- a/resources/tools/scripts/download_hc_pkgs.sh
+++ b/resources/tools/scripts/download_hc_pkgs.sh
@@ -42,7 +42,7 @@ elif [ "${OS}" == "centos7" ]; then
OS="centos7"
PACKAGE="rpm rpm.md5"
CLASS=""
- VPP_ARTIFACTS="vpp vpp-debuginfo vpp-lib vpp-plugins"
+ VPP_ARTIFACTS="vpp vpp-lib vpp-plugins"
DPDK_ARTIFACTS=""
fi
diff --git a/resources/tools/scripts/download_install_vpp_pkgs.sh b/resources/tools/scripts/download_install_vpp_pkgs.sh
index 8928a2fee2..0dd597d3ee 100755
--- a/resources/tools/scripts/download_install_vpp_pkgs.sh
+++ b/resources/tools/scripts/download_install_vpp_pkgs.sh
@@ -34,7 +34,7 @@ if [ -f "/etc/redhat-release" ]; then
MD5FILES=*.rpm.md5
fi
- ARTIFACTS="vpp vpp-debuginfo vpp-devel vpp-lib vpp-plugins"
+ ARTIFACTS="vpp vpp-devel vpp-lib vpp-plugins"
PACKAGE="rpm rpm.md5"
CLASS=""
VPP_INSTALL_COMMAND="rpm -ivh *.rpm"
diff --git a/resources/tools/scripts/download_install_vpp_rpms.sh b/resources/tools/scripts/download_install_vpp_rpms.sh
index 29e09216db..25390fbf88 100644
--- a/resources/tools/scripts/download_install_vpp_rpms.sh
+++ b/resources/tools/scripts/download_install_vpp_rpms.sh
@@ -26,7 +26,7 @@ else
REPO='https://nexus.fd.io/content/repositories/fd.io.centos7'
fi
-ARTIFACTS="vpp vpp-lib vpp-debuginfo vpp-devel vpp-python-api vpp-plugins"
+ARTIFACTS="vpp vpp-lib vpp-devel vpp-python-api vpp-plugins"
yum-config-manager --add-repo $REPO