From 1e8434a6585baadb1f1a07425db64adacc02886c Mon Sep 17 00:00:00 2001
From: Vitaly Parakhin <vparakhin@mirantis.com>
Date: Fri, 29 Aug 2014 11:46:15 +0300
Subject: [PATCH] Fixes to build from trunc feature

1. Fix public Gerrit URL in config
2. Fix adding package dependencies to local mirror
3. Fix for including built packages into ISO.

Change-Id: I324fc5bcb32c12a394091115f5800e2f7c278f27
Blueprint: openstack-from-master
---
 config.mk                        |  6 +++---
 iso/module.mk                    |  1 +
 packages/openstack/rpm/module.mk | 11 ++++++++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/config.mk b/config.mk
index 704a5633c..de5d3abfc 100644
--- a/config.mk
+++ b/config.mk
@@ -78,11 +78,11 @@ NO_UI_OPTIMIZE:=0
 define set_vars
     $(call uc,$(1))_REPO?=https://github.com/openstack/$(1).git
     $(call uc,$(1))_COMMIT?=master
-    $(call uc,$(1))_SPEC_REPO?=https://osci-gerrit.mirantis.com/openstack-ci/openstack/$(1)-build.git
+    $(call uc,$(1))_SPEC_REPO?=https://review.fuel-infra.org/openstack-build/$(1)-build.git
     $(call uc,$(1))_SPEC_COMMIT?=master
-    $(call uc,$(1))_GERRIT_URL=https://review.openstack.org/openstack/$(1)
+    $(call uc,$(1))_GERRIT_URL?=https://review.openstack.org/openstack/$(1).git
     $(call uc,$(1))_GERRIT_COMMIT?=none
-    $(call uc,$(1))_SPEC_GERRIT_URL?=https://osci-gerrit.mirantis.com/openstack-ci/openstack/$(1)-build.git
+    $(call uc,$(1))_SPEC_GERRIT_URL?=https://review.fuel-infra.org/openstack-build/$(1)-build.git
     $(call uc,$(1))_SPEC_GERRIT_COMMIT?=none
 endef
 
diff --git a/iso/module.mk b/iso/module.mk
index 18142468d..aa8320470 100644
--- a/iso/module.mk
+++ b/iso/module.mk
@@ -58,6 +58,7 @@ else
 $(BUILD_DIR)/iso/isoroot-centos.done: \
 		$(BUILD_DIR)/mirror/build.done \
 		$(BUILD_DIR)/packages/build.done \
+		$(BUILD_DIR)/openstack/build.done \
 		$(BUILD_DIR)/iso/isoroot-dotfiles.done
 	mkdir -p $(ISOROOT)
 	rsync -rp $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/ $(ISOROOT)
diff --git a/packages/openstack/rpm/module.mk b/packages/openstack/rpm/module.mk
index 098e435bb..e98054d7d 100644
--- a/packages/openstack/rpm/module.mk
+++ b/packages/openstack/rpm/module.mk
@@ -13,6 +13,13 @@ baseurl=http://fuel-repository.mirantis.com/repos/centos-fuel-master/centos/
 gpgcheck=0
 enabled=0
 priority=1
+
+[openstack-local]
+name=OpenStack-local
+baseurl=file://$(SANDBOX)/tmp/RPMS/noarch/
+gpgcheck=0
+enabled=0
+priority=1
 endef
 
 define INSTALL_CENTOS_REPO
@@ -54,7 +61,7 @@ $(BUILD_DIR)/openstack/rpm/$1.done: \
 	sudo mkdir -p $$(SANDBOX)/tmp/SPECS $$(SANDBOX)/tmp/SOURCES $$(SANDBOX)/tmp/BUILD $$(SANDBOX)/tmp/BUILDROOT $$(SANDBOX)/tmp/RPMS $$(SANDBOX)/tmp/SRPMS
 	sudo cp $(BUILD_DIR)/openstack/rpm/sources/$1/*.tar.gz $$(SANDBOX)/tmp/SOURCES/
 	sudo cp -r $(BUILD_DIR)/repos/$1-build/rpm/SOURCES/* $$(SANDBOX)/tmp/SOURCES
-	sed "s/Version:.*/Version:\t`cat $(BUILD_DIR)/openstack/rpm/$1-version-tag`/" $(BUILD_DIR)/repos/$1-build/rpm/SPECS/openstack-$1.spec > $(BUILD_DIR)/openstack/rpm/sources/specs/openstack-$1.spec
+	sed "s/Version:.*/Version:\t`cat $(BUILD_DIR)/openstack/rpm/$1-version-tag`/" $(BUILD_DIR)/repos/$1-build/rpm/SPECS/*.spec > $(BUILD_DIR)/openstack/rpm/sources/specs/openstack-$1.spec
 	sed -i "s/Source0:.*/Source0:\t$1-`cat $(BUILD_DIR)/openstack/rpm/$1-version-tag`\.tar\.gz/" $(BUILD_DIR)/openstack/rpm/sources/specs/openstack-$1.spec
 	sudo cp $(BUILD_DIR)/openstack/rpm/sources/specs/openstack-$1.spec $$(SANDBOX)/tmp/
 	sudo chroot $$(SANDBOX) rpmbuild --nodeps -vv --define "_topdir /tmp" -bs /tmp/openstack-$1.spec
@@ -63,6 +70,8 @@ $(BUILD_DIR)/openstack/rpm/$1.done: \
 	sudo rm -rf $$(SANDBOX)/tmp/RPMS
 	sudo chroot $$(SANDBOX) rpmbuild --nodeps -vv --define "_topdir /tmp" -ba /tmp/openstack-$1.spec
 	cp $$(SANDBOX)/tmp/RPMS/*/*$1*.rpm $(BUILD_DIR)/openstack/rpm/RPMS/x86_64
+	sudo createrepo $$(SANDBOX)/tmp/RPMS/noarch/
+	sudo yumdownloader --resolve -c $$(SANDBOX)/etc/yum.conf --enablerepo=centos --enablerepo=centos-master --enablerepo=openstack-local --destdir=$(LOCAL_MIRROR_CENTOS_OS_BASEURL)/Packages openstack-$1* | grep -v '^looking for' | tee $(BUILD_DIR)/openstack/yumdownloader.log
 	sudo sh -c "$$$${SANDBOX_DOWN}"
 	$$(ACTION.TOUCH)