diff options
| author |   Feng Pan <fpan@redhat.com> | 2017-10-03 22:42:36 -0400 |
|---|---|---|
| committer |   Tim Rozet <trozet@redhat.com> | 2017-10-06 20:06:01 +0000 |
| commit | 205eb09eccd5661dda9ab627c99aab6175783e9b (patch) | |
| tree | cfb8a5090db206e5a406116c062e9e74ccb258e1 | |
| parent | 8c9675c16e4350aa855c2d2c847fb18eed3a72ec (diff) | |
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>
(cherry picked from commit 89932c44597ae86e8460939896f978862005596f)
| -rwxr-xr-x | build/overcloud-full.sh | 8 | ||||
| -rw-r--r-- | ci/PR_revision.log | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 87ba6973..e747c745 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 |