From: Feng Pan <fpan@redhat.com>
Date: Wed, 4 Oct 2017 02:42:36 +0000 (-0400)
Subject: Use stable/17.10 branch for VPP
X-Git-Tag: opnfv-6.0.0~74^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=apex.git;a=commitdiff_plain;h=89932c44597ae86e8460939896f978862005596f

Use stable/17.10 branch for VPP

also add retry and timeout for VPP interface check in os-net-config

apex-os-net-config: Idaf03d78d2ce657ac484c1285a795d98760d0112

Change-Id: I3dca43d263923e2ae7ff84781d3f7aa64fad6b5d
Signed-off-by: Feng Pan <fpan@redhat.com>
---

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index dea70f54..13f0e59f 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -106,11 +106,11 @@ pushd puppet-fdio > /dev/null
 git archive --format=tar.gz --prefix=fdio/ HEAD > ${BUILD_DIR}/puppet-fdio.tar.gz
 popd > /dev/null
 
-# Master FD.IO Repo
+# FD.IO Repo
 cat > ${BUILD_DIR}/fdio.repo << EOF
-[fdio-master]
-name=fd.io master branch latest merge
-baseurl=https://nexus.fd.io/content/repositories/fd.io.master.centos7/
+[fdio-1710]
+name=fd.io packages
+baseurl=https://nexus.fd.io/content/repositories/fd.io.stable.1710.centos7/
 enabled=1
 gpgcheck=0
 EOF
diff --git a/ci/PR_revision.log b/ci/PR_revision.log
index 3095d2dc..b83ca400 100644
--- a/ci/PR_revision.log
+++ b/ci/PR_revision.log
@@ -10,3 +10,4 @@ apex-puppet-tripleo, Ie336c22b366bd478963ca14e25d645fec0cded7a
 apex-tripleo-heat-templates, I0749ed6e0d27bd4c9a5bb19657579d400501d09e
 apex-puppet-tripleo, I486c4045e29c7032526be6e19d11e7979070c2d9
 
+apex-os-net-config, Idaf03d78d2ce657ac484c1285a795d98760d0112
\ No newline at end of file