summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-09-23 10:57:16 -0400
committerTim Rozet <trozet@redhat.com>2017-09-23 10:57:16 -0400
commit7e062540b6865c0751d6e982b496acc0bbc8b6b7 (patch)
treec7bc75916aaebd2155e5be705ca5231ae6356a99 /build
parentec03e76b54e69af8daabc9d2b1c30145052ded17 (diff)
Use the right branch for apex forks with euphrates
Change-Id: Iee95bfbf4ac4beb4057403422de8e48a047d33ca Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'build')
-rwxr-xr-xbuild/overcloud-full.sh4
-rwxr-xr-xbuild/undercloud.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 6fdc32d6..06e461f7 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -25,13 +25,13 @@ mv -f ${BUILD_DIR}/overcloud-full.qcow2 ${BUILD_DIR}/overcloud-full_build.qcow2
pushd ${BUILD_DIR} > /dev/null
# prep opnfv-puppet-tripleo for undercloud
-python3 -B $BUILD_UTILS clone-fork -r apex-puppet-tripleo
+python3 -B $BUILD_UTILS clone-fork -r apex-puppet-tripleo -b stable/euphrates
pushd apex-puppet-tripleo > /dev/null
git archive --format=tar.gz --prefix=tripleo/ HEAD > ${BUILD_DIR}/apex-puppet-tripleo.tar.gz
popd > /dev/null
# download customized os-net-config
-python3 -B $BUILD_UTILS clone-fork -r apex-os-net-config
+python3 -B $BUILD_UTILS clone-fork -r apex-os-net-config -b stable/euphrates
pushd apex-os-net-config/os_net_config > /dev/null
git archive --format=tar.gz --prefix=os_net_config/ HEAD > ${BUILD_DIR}/apex-os-net-config.tar.gz
popd > /dev/null
diff --git a/build/undercloud.sh b/build/undercloud.sh
index 05cbf552..83ed21be 100755
--- a/build/undercloud.sh
+++ b/build/undercloud.sh
@@ -18,7 +18,7 @@ cp -f ${CACHE_DIR}/undercloud.qcow2 ${BUILD_DIR}/undercloud_build.qcow2
pushd ${BUILD_DIR} > /dev/null
# prep apex-tht for undercloud
-python3 -B $BUILD_UTILS clone-fork -r apex-tripleo-heat-templates
+python3 -B $BUILD_UTILS clone-fork -r apex-tripleo-heat-templates -b stable/euphrates
pushd apex-tripleo-heat-templates > /dev/null
git archive --format=tar.gz --prefix=openstack-tripleo-heat-templates/ HEAD > ${BUILD_DIR}/apex-tripleo-heat-templates.tar.gz
popd > /dev/null