From 8ab6ced38e575d29902646eb0acd7cc4503b7d92 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Wed, 23 Nov 2016 16:07:49 -0500 Subject: Adding git commit to RPM releases Preparing for better caching by adding the git hash to the rpm release We can skip building the RPMs if they are cached and would be built off the same hash JIRA: APEX-325 Change-Id: I9b0e26f123667673d126362a2501abb13830e44b Signed-off-by: Dan Radez --- build/variables.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'build/variables.sh') diff --git a/build/variables.sh b/build/variables.sh index c307c84c..c8754379 100644 --- a/build/variables.sh +++ b/build/variables.sh @@ -14,7 +14,6 @@ onos_release_file=onos-1.6.0-rc2.tar.gz onos_jdk_uri=http://artifacts.opnfv.org/apex/colorado onos_ovs_uri=http://artifacts.opnfv.org/apex/colorado onos_ovs_pkg=package_ovs_rpm3.tar.gz -openstack_congress_pkg="openstack-congress-2016.1-1$(rpm -E '%dist').noarch.rpm" doctor_driver=https://raw.githubusercontent.com/openstack/congress/master/congress/datasources/doctor_driver.py if [ -z ${GS_PATHNAME+x} ]; then GS_PATHNAME=/colorado @@ -27,3 +26,18 @@ dpdk_rpms=( 'ovs4opnfv-e8acab14-dpdk-tools-16.04.0-1.el7.centos.x86_64.rpm' 'ovs4opnfv-e8acab14-openvswitch-2.5.90-0.12032.gitc61e93d6.1.el7.centos.x86_64.rpm' ) + +tackerclient_repo="http://github.com/trozet/python-tackerclient" +tackerclient_branch="SFC_refactor" +tackerclient_commit=$(git ls-remote ${tackerclient_repo} ${tackerclient_branch} | awk '{print substr($$1,1,7)}') +tackerclient_pkg=python-tackerclient-2015.2-1.trozetgit${tackerclient_commit}.noarch.rpm + +congress_repo="http://github.com/openstack/congress" +congress_branch="stable/mitaka" +congress_commit=$(git ls-remote ${congress_repo} ${congress_branch} | awk '{print substr($$1,1,7)}') +congress_pkg=openstack-congress-2016.1-1.git${congress_commit}$(rpm -E %dist).noarch.rpm + +netvpp_repo="https://github.com/openstack/networking-vpp" +netvpp_branch="master" +netvpp_commit=$(git ls-remote ${netvpp_repo} ${netvpp_branch} | awk '{print substr($$1,1,7)}') +netvpp_pkg=networking-vpp-0.0.1-1.git${NETVPP_COMMIT}$(rpm -E %dist).noarch.rpm -- cgit 1.2.3-korg