summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-03-16 11:42:13 -0400
committerFeng Pan <fpan@redhat.com>2017-03-17 02:41:28 +0000
commit9cd38d64a7e2e31ab2a5919e6480377a08faeb42 (patch)
tree7a6957321e7397776896f3e7640b1599dbf72312
parent5a9a47fc0c3b3e7d53093ce97010fe441af6bb47 (diff)
Removes building quagga/zrpc
Since building this takes 10 minutes or so and it has intermittent failures, we are moving it to artifacts. If we need timely changes we can implement a job to build it, using the apex makefile. JIRA: APEX-403 Change-Id: Ie26106062143c968492dce52149459a8dc7a47ba Signed-off-by: Tim Rozet <trozet@redhat.com> (cherry picked from commit d5527ec6ff391ddd3f872b7f8a7bc3f1f2075381)
-rw-r--r--build/Makefile2
-rwxr-xr-xbuild/overcloud-opendaylight.sh8
2 files changed, 4 insertions, 6 deletions
diff --git a/build/Makefile b/build/Makefile
index 0bedd9d..b81ddd3 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -248,7 +248,7 @@ $(BUILD_DIR)/overcloud-full.qcow2: congress-rpm tacker-rpm networking-vpp-rpm
###############
.PHONY: overcloud-opendaylight
-overcloud-opendaylight: quagga-zrpc $(BUILD_DIR)/overcloud-full-opendaylight.qcow2
+overcloud-opendaylight: $(BUILD_DIR)/overcloud-full-opendaylight.qcow2
$(BUILD_DIR)/overcloud-full-opendaylight.qcow2: $(BUILD_DIR)/overcloud-full.qcow2
@echo "Building the Apex OpenDaylight Overcloud Image"
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index fdbb75f..f892c71 100755
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -73,10 +73,8 @@ pushd netready/ > /dev/null
git archive --format=tar.gz HEAD:deploy/puppet/ > ${BUILD_DIR}/puppet-gluon.tar.gz
popd > /dev/null
-# Tar up all quagga/zrpc rpms
-pushd ${QUAGGA_RPMS_DIR}/rpmbuild/RPMS > /dev/null
-tar --transform "s/^x86_64/quagga/" -czvf ${BUILD_DIR}/quagga.tar.gz x86_64/
-popd > /dev/null
+# Download quagga/zrpc rpms
+populate_cache http://artifacts.opnfv.org/apex/danube/quagga/quagga.tar.gz
# install ODL packages
# Patch in OPNFV custom puppet-tripleO
@@ -106,7 +104,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--install python-click \
--upload ${CACHE_DIR}/$gluon_rpm:/root/\
--install /root/$gluon_rpm \
- --upload ${BUILD_DIR}/quagga.tar.gz:/root/ \
+ --upload ${CACHE_DIR}/quagga.tar.gz:/root/ \
--run-command "cd /root/ && tar xzf quagga.tar.gz" \
--run-command "yum downgrade -y python-zmq-14.3.1" \
--install zeromq-4.1.4,zeromq-devel-4.1.4 \