From 02ccb1767ade6c0e10741b0a7db12b880016b6a1 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Mon, 14 Sep 2015 11:23:57 -0400 Subject: changing branch to checkout from to arno/stable and placing all repo contents into /root instead of deploy.sh only in /bin Change-Id: I5c7c3a990bf18480b1e99a2119363e30e68e6d12 Signed-off-by: Dan Radez --- foreman/build/opnfv-genesis.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'foreman/build/opnfv-genesis.spec') diff --git a/foreman/build/opnfv-genesis.spec b/foreman/build/opnfv-genesis.spec index 674760f..bcac1a9 100644 --- a/foreman/build/opnfv-genesis.spec +++ b/foreman/build/opnfv-genesis.spec @@ -21,11 +21,12 @@ The files from the OPNFV genesis repo %build %install -mkdir -p %{buildroot}/usr/bin/ -cp foreman/ci/deploy.sh %{buildroot}/usr/bin/ +mkdir -p %{buildroot}/root/genesis +cp -r foreman/ %{buildroot}/root/genesis +cp -r common/ %{buildroot}/root/genesis %files -/usr/bin/deploy.sh +/root/genesis %changelog -- cgit 1.2.3-korg From 871f020abcef1a1ff652ef0e0c9c50420c4c6aac Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Tue, 15 Sep 2015 11:14:53 -0400 Subject: adding files to the build cache to reduce bandwidth by reusing already downloaded build dependancies reverting git archive to use HEAD, jenkins checks out the correct branch so we can rely on head Change-Id: Iaf308ebdbd72e96c87fb49ee04168a7e9a905d98 Signed-off-by: Dan Radez --- foreman/build/Makefile | 6 +++--- foreman/build/cache.mk | 2 ++ foreman/build/opnfv-genesis.spec | 10 ++++++---- 3 files changed, 11 insertions(+), 7 deletions(-) (limited to 'foreman/build/opnfv-genesis.spec') diff --git a/foreman/build/Makefile b/foreman/build/Makefile index 09e91d2..2d2a2a7 100644 --- a/foreman/build/Makefile +++ b/foreman/build/Makefile @@ -26,7 +26,7 @@ export VBOXDNLD = http://download.virtualbox.org/virtualbox/rpm/el/7.1/x86_64/Vi export VBOXRPM = $(shell pwd)/VirtualBox-4.3-4.3.26_98988_el7-1.x86_64.rpm export VAGRANTDNLD = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.2_x86_64.rpm export VAGRANTRPM = $(shell pwd)/vagrant_1.7.2_x86_64.rpm -export GENESISRPM = $(shell pwd)/x86_64/opnfv-genesis-0.1-1.x86_64.rpm +export GENESISRPM = $(shell pwd)/x86_64/opnfv-genesis-0.2-1.x86_64.rpm # Note! Invoke with "make REVSTATE=RXXXX all" to make release build! # Invoke with ICOCACHE=/full/path/to/iso if cached ISO is in non-standard location. @@ -106,8 +106,8 @@ rpm-clean: .PHONY: rpm rpm: - pushd ../../ && git archive --format=tar --prefix=opnfv-genesis-0.1/ origin/stable/arno | gzip > foreman/build/opnfv-genesis.tar.gz - rpmbuild -ba opnfv-genesis.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' + pushd ../../ && git archive --format=tar --prefix=opnfv-genesis-0.2/ HEAD | gzip > foreman/build/opnfv-genesis.tar.gz + rpmbuild -ba opnfv-genesis.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' @make rpm-clean diff --git a/foreman/build/cache.mk b/foreman/build/cache.mk index fdfd003..56b7273 100644 --- a/foreman/build/cache.mk +++ b/foreman/build/cache.mk @@ -16,6 +16,8 @@ CACHECLEAN := $(addsuffix .clean,$(CACHEFILES) $(CACHEDIRS)) # BEGIN of variables to customize # CACHEFILES += .versions +CACHEFILES += $(shell basename $(VAGRANTRPM)) +CACHEFILES += $(shell basename $(VBOXRPM)) CACHEFILES += $(shell basename $(ISOSRC)) # # END of variables to customize diff --git a/foreman/build/opnfv-genesis.spec b/foreman/build/opnfv-genesis.spec index bcac1a9..30692b4 100644 --- a/foreman/build/opnfv-genesis.spec +++ b/foreman/build/opnfv-genesis.spec @@ -1,5 +1,5 @@ Name: opnfv-genesis -Version: 0.1 +Version: 0.2 Release: 1 Summary: The files from the OPNFV genesis repo @@ -8,8 +8,8 @@ License: Apache 2.0 URL: https://gerrit.opnfv.org/gerrit/genesis.git Source0: opnfv-genesis.tar.gz -#BuildRequires: -Requires: vagrant, VirtualBox-4.3 +#BuildRequires: +Requires: vagrant, VirtualBox-4.3, net-tools %description The files from the OPNFV genesis repo @@ -30,5 +30,7 @@ cp -r common/ %{buildroot}/root/genesis %changelog -* Fri Apr 24 2015 Dan Radez - 0.1-1 +* Tue Sep 15 2015 Dan Radez - 0.2-1 +- Updating the install files and cleaning up white space +* Fri Apr 24 2015 Dan Radez - 0.1-1 - Initial Packaging -- cgit 1.2.3-korg