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/rpm_specs/networking-vpp.spec | 35 ++++++++++++++++---------------- build/rpm_specs/openstack-congress.spec | 2 +- build/rpm_specs/openstack-tacker.spec | 2 +- build/rpm_specs/python-tackerclient.spec | 2 +- 4 files changed, 20 insertions(+), 21 deletions(-) (limited to 'build/rpm_specs') diff --git a/build/rpm_specs/networking-vpp.spec b/build/rpm_specs/networking-vpp.spec index 2fd4e049..fea66eb8 100644 --- a/build/rpm_specs/networking-vpp.spec +++ b/build/rpm_specs/networking-vpp.spec @@ -1,26 +1,25 @@ -%define name networking-vpp -%define version %(python setup.py --version) %define release 1 -%define _topdir %(pwd)/build/rpm -%define _builddir %(pwd) -%define _rpmdir %(pwd)/build/rpm - -Summary: OpenStack Networking for VPP -Name: %{name} -Version: %{version} -Release: %{release} -License: Apache 2.0 -Group: Development/Libraries + +Summary: OpenStack Networking for VPP +Name: networking-vpp +Version: 0.0.1 +Release: %{release}%{?git}%{?dist} + +License: Apache 2.0 +Group: Applications/Internet +Source0: networking-vpp.tar.gz +Url: https://github.com/openstack/networking-vpp/ + BuildArch: noarch -Requires: vpp -Vendor: OpenStack -Packager: Feng Pan -Url: http://www.openstack.org/ +Requires: vpp +Vendor: OpenStack +Packager: Feng Pan %description ML2 Mechanism driver and small control plane for OpenVPP forwarder %prep +%setup -q cat << EOF > %{_builddir}/networking-vpp-agent.service [Unit] Description=Networking VPP ML2 Agent @@ -38,12 +37,12 @@ WantedBy=multi-user.target EOF %install -/usr/bin/python setup.py install -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES +python setup.py install -O1 --root=%{buildroot} --record=INSTALLED_FILES mkdir -p %{buildroot}/usr/lib/systemd/system install %{_builddir}/networking-vpp-agent.service %{buildroot}/usr/lib/systemd/system %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files -f INSTALLED_FILES %defattr(-,root,root) diff --git a/build/rpm_specs/openstack-congress.spec b/build/rpm_specs/openstack-congress.spec index c4c04a97..fd8e95ef 100644 --- a/build/rpm_specs/openstack-congress.spec +++ b/build/rpm_specs/openstack-congress.spec @@ -2,7 +2,7 @@ Name: openstack-congress Version: 2016.1 -Release: 1%{?dist} +Release: 1%{?git}%{?dist} Summary: OpenStack servicevm/device manager Group: Applications/Internet diff --git a/build/rpm_specs/openstack-tacker.spec b/build/rpm_specs/openstack-tacker.spec index b4c9adaa..b491cd1e 100644 --- a/build/rpm_specs/openstack-tacker.spec +++ b/build/rpm_specs/openstack-tacker.spec @@ -2,7 +2,7 @@ Name: openstack-tacker Version: 2015.2 -Release: 1.trozet +Release: 1%{?git} Summary: OpenStack servicevm/device manager Group: Applications/Internet diff --git a/build/rpm_specs/python-tackerclient.spec b/build/rpm_specs/python-tackerclient.spec index 72cbf629..aa379361 100644 --- a/build/rpm_specs/python-tackerclient.spec +++ b/build/rpm_specs/python-tackerclient.spec @@ -2,7 +2,7 @@ Name: python-tackerclient Version: 2015.2 -Release: 1.trozet +Release: 1%{?git} Summary: CLI and Client Library for OpenStack Networking Group: Applications/Internet -- cgit