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/overcloud-full.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'build/overcloud-full.sh') diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 95a7b04e..188c40e4 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -113,7 +113,8 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --upload /tmp/fdio.repo:/etc/yum.repos.d/fdio.repo \ $dpdk_pkg_str \ --run-command "yum install --downloadonly --downloaddir=/root/fdio vpp vpp-devel vpp-lib vpp-python-api vpp-plugins" \ - --upload ../networking-vpp.noarch.rpm:/root/fdio \ + $fdio_pkg_str \ + --upload ../noarch/$netvpp_pkg:/root/fdio \ --run-command "pip install distro flask_restful" \ --run-command "yum install -y etcd" \ --run-command "pip install python-etcd" \ @@ -124,8 +125,8 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "yum remove -y qemu-system-x86" \ --upload ../os-net-config.tar.gz:/usr/lib/python2.7/site-packages \ --run-command "cd /usr/lib/python2.7/site-packages/ && rm -rf os_net_config && tar xzf os-net-config.tar.gz" \ - --upload ../noarch/$openstack_congress_pkg:/root/ \ - --install /root/$openstack_congress_pkg \ + --upload ../noarch/$congress_pkg:/root/ \ + --install /root/$congress_pkg \ --install "python2-congressclient" \ --upload puppet-congress.tar.gz:/etc/puppet/modules/ \ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-congress.tar.gz" \ -- cgit 1.2.3-korg