Pull stable branches of apex dependency repos instead of master

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

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 13b10b9..4740066 100755 (executable)
--- 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 $APEX_BRANCH
 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 $APEX_BRANCH
 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 6bb8ac9..34f22b1 100755 (executable)
--- 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 $APEX_BRANCH
 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

diff --git a/build/variables.sh b/build/variables.sh
index 1c11844..9319178 100644 (file)
--- a/build/variables.sh
+++ b/build/variables.sh
@@ -15,6 +15,7 @@ CACHE_DIR="$(dirname ${BUILD_ROOT})/.cache"
 CACHE_HISTORY=".cache_history"
 PATCHES_DIR="${BUILD_ROOT}/patches"
 BUILD_UTILS="$(dirname ${BUILD_ROOT})/apex/build_utils.py"
+APEX_BRANCH="stable/fraser"
 
 # Run virt-customize commands with a guest memory of 4G to avoid
 # oom issues on some of the larger build steps