From 6e2fe707c84393aca90af72fbfcbbc7be5416769 Mon Sep 17 00:00:00 2001 From: Vladimir Kozhukalov Date: Thu, 9 Jul 2015 14:48:55 +0300 Subject: [PATCH] Separate repository for Fuel Agent * added stackforge/fuel-agent repository * added fuel-agent package Change-Id: I53a881f502b0ccc3e16ab873aa1ed8a4f3287fa5 Implements: bp split-fuel-web-repo --- config.mk | 4 ++++ packages/module.mk | 4 +++- packages/rpm/module.mk | 7 ++++--- repos.mk | 3 ++- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/config.mk b/config.mk index 080cdd876..c5ba4d76f 100644 --- a/config.mk +++ b/config.mk @@ -119,12 +119,14 @@ endef FUELLIB_COMMIT?=master NAILGUN_COMMIT?=master PYTHON_FUELCLIENT_COMMIT?=master +FUEL_AGENT_COMMIT?=master ASTUTE_COMMIT?=master OSTF_COMMIT?=master FUELLIB_REPO?=https://github.com/stackforge/fuel-library.git NAILGUN_REPO?=https://github.com/stackforge/fuel-web.git PYTHON_FUELCLIENT_REPO?=https://github.com/stackforge/python-fuelclient.git +FUEL_AGENT_REPO?=https://github.com/stackforge/fuel-agent.git ASTUTE_REPO?=https://github.com/stackforge/fuel-astute.git OSTF_REPO?=https://github.com/stackforge/fuel-ostf.git @@ -132,12 +134,14 @@ OSTF_REPO?=https://github.com/stackforge/fuel-ostf.git FUELLIB_GERRIT_URL?=https://review.openstack.org/stackforge/fuel-library NAILGUN_GERRIT_URL?=https://review.openstack.org/stackforge/fuel-web PYTHON_FUELCLIENT_GERRIT_URL?=https://review.openstack.org/stackforge/python-fuelclient +FUEL_AGENT_GERRIT_URL?=https://review.openstack.org/stackforge/fuel-agent ASTUTE_GERRIT_URL?=https://review.openstack.org/stackforge/fuel-astute OSTF_GERRIT_URL?=https://review.openstack.org/stackforge/fuel-ostf FUELLIB_GERRIT_COMMIT?=none NAILGUN_GERRIT_COMMIT?=none PYTHON_FUELCLIENT_GERRIT_COMMIT?=none +FUEL_AGENT_GERRIT_COMMIT?=none ASTUTE_GERRIT_COMMIT?=none OSTF_GERRIT_COMMIT?=none FUELMAIN_GERRIT_COMMIT?=none diff --git a/packages/module.mk b/packages/module.mk index e253d8a25..0e8efe220 100644 --- a/packages/module.mk +++ b/packages/module.mk @@ -94,6 +94,8 @@ $(eval $(call prepare_git_source,astute,astute-$(PACKAGE_VERSION).tar.gz,$(BUILD $(eval $(call prepare_git_source,fuel-library$(PRODUCT_VERSION),fuel-library$(PRODUCT_VERSION)-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuel-library$(PRODUCT_VERSION),HEAD,$(FUELLIB_GERRIT_COMMIT))) #FUEL_PYTHON_PKGS $(eval $(call prepare_git_source,python-fuelclient,python-fuelclient-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/python-fuelclient,HEAD,$(PYTHON_FUELCLIENT_GERRIT_COMMIT))) +#FUEL_AGENT_PKGS +$(eval $(call prepare_git_source,fuel-agent,fuel-agent-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuel-agent,HEAD,$(FUEL_AGENT_GERRIT_COMMIT))) #FUEL-IMAGE PKGS $(eval $(call prepare_git_source,fuel-main,fuel-main-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuel-main,HEAD,$(FUELMAIN_GERRIT_COMMIT))) @@ -117,7 +119,7 @@ packages-deb: $(BUILD_DIR)/packages/deb/build.done #FIXME(aglarendil): make sources generation uniform #$(BUILD_DIR)/packages/source_fuel-library.done: $(BUILD_DIR)/packages/source_fuel-library$(PRODUCT_VERSION).done -# ln -s $(BUILD_DIR)/packages/sources/fuel-library$(PRODUCT_VERSION) $(BUILD_DIR)/packages/sources/fuel-library +# ln -s $(BUILD_DIR)/packages/sources/fuel-library$(PRODUCT_VERSION) $(BUILD_DIR)/packages/sources/fuel-library # $(ACTION.TOUCH) ################################### diff --git a/packages/rpm/module.mk b/packages/rpm/module.mk index 70dfca1fc..89feb3926 100644 --- a/packages/rpm/module.mk +++ b/packages/rpm/module.mk @@ -12,7 +12,7 @@ clean-rpm: RPM_SOURCES:=$(BUILD_DIR)/packages/rpm/SOURCES -$(BUILD_DIR)/packages/rpm/buildd.tar.gz: SANDBOX_PACKAGES:=ruby21 rpm-build tar python-setuptools python-pbr nodejs npm yum yum-utils git +$(BUILD_DIR)/packages/rpm/buildd.tar.gz: SANDBOX_PACKAGES:=ruby21 rpm-build tar python-setuptools python-pbr nodejs npm yum yum-utils git $(BUILD_DIR)/packages/rpm/buildd.tar.gz: SANDBOX:=$(BUILD_DIR)/packages/rpm/SANDBOX/buildd $(BUILD_DIR)/packages/rpm/buildd.tar.gz: export SANDBOX_UP:=$(SANDBOX_UP) $(BUILD_DIR)/packages/rpm/buildd.tar.gz: export SANDBOX_DOWN:=$(SANDBOX_DOWN) @@ -51,7 +51,7 @@ $(BUILD_DIR)/packages/rpm/$1.done: mkdir -p $(BUILD_DIR)/packages/rpm/RPMS/x86_64 mkdir -p $$(SANDBOX) && \ sudo tar xzf $(BUILD_DIR)/packages/rpm/buildd.tar.gz -C $$(SANDBOX) && \ - sudo chroot $$(SANDBOX) bash -c "(mkdir -p '$$$${TEMP}'; mkdir -p /tmp/user/0)" + sudo chroot $$(SANDBOX) bash -c "(mkdir -p '$$$${TEMP}'; mkdir -p /tmp/user/0)" sudo mount --bind /proc $$(SANDBOX)/proc && \ sudo mount --bind /dev $$(SANDBOX)/dev && \ mkdir -p $$(SANDBOX)/tmp/SOURCES && \ @@ -83,7 +83,8 @@ fuel-library$(PRODUCT_VERSION) \ astute \ nailgun \ fuel-ostf \ -python-fuelclient +python-fuelclient \ +fuel-agent $(eval $(foreach pkg,$(packages_list),$(call build_rpm,$(pkg))$(NEWLINE))) diff --git a/repos.mk b/repos.mk index 0e17560ff..a915d1bcc 100644 --- a/repos.mk +++ b/repos.mk @@ -40,11 +40,12 @@ endef $(eval $(call build_repo,nailgun,$(NAILGUN_REPO),$(NAILGUN_COMMIT),$(NAILGUN_GERRIT_URL),$(NAILGUN_GERRIT_COMMIT))) $(eval $(call build_repo,python-fuelclient,$(PYTHON_FUELCLIENT_REPO),$(PYTHON_FUELCLIENT_COMMIT),$(PYTHON_FUELCLIENT_GERRIT_URL),$(PYTHON_FUELCLIENT_GERRIT_COMMIT))) +$(eval $(call build_repo,fuel-agent,$(FUEL_AGENT_REPO),$(FUEL_AGENT_COMMIT),$(FUEL_AGENT_GERRIT_URL),$(FUEL_AGENT_GERRIT_COMMIT))) $(eval $(call build_repo,astute,$(ASTUTE_REPO),$(ASTUTE_COMMIT),$(ASTUTE_GERRIT_URL),$(ASTUTE_GERRIT_COMMIT))) $(eval $(call build_repo,fuel-library,$(FUELLIB_REPO),$(FUELLIB_COMMIT),$(FUELLIB_GERRIT_URL),$(FUELLIB_GERRIT_COMMIT))) $(eval $(call build_repo,fuel-ostf,$(OSTF_REPO),$(OSTF_COMMIT),$(OSTF_GERRIT_URL),$(OSTF_GERRIT_COMMIT))) -$(BUILD_DIR)/repos/fuel-main.done: +$(BUILD_DIR)/repos/fuel-main.done: ln -s $(SOURCE_DIR) $(BUILD_DIR)/repos/fuel-main $(ACTION.TOUCH) $(BUILD_DIR)/repos/repos.done: $(BUILD_DIR)/repos/fuel-main.done $(BUILD_DIR)/repos/fuel-library$(PRODUCT_VERSION).done