Build fuel-createmirror together with ISO

Change-Id: I56aca770b55e47c0fc99568792e2bbccd784909b
This commit is contained in:
Vladimir Kozhukalov 2015-10-01 20:25:39 +03:00
parent 26cec2d558
commit 0b1c79b05e
6 changed files with 10 additions and 10 deletions

View File

@ -98,6 +98,7 @@ FUEL_AGENT_COMMIT?=master
FUEL_NAILGUN_AGENT_COMMIT?=master
ASTUTE_COMMIT?=master
OSTF_COMMIT?=master
CREATEMIRROR_COMMIT?=master
FUELLIB_REPO?=https://github.com/stackforge/fuel-library.git
NAILGUN_REPO?=https://github.com/stackforge/fuel-web.git
@ -106,6 +107,7 @@ FUEL_AGENT_REPO?=https://github.com/stackforge/fuel-agent.git
FUEL_NAILGUN_AGENT_REPO?=https://github.com/stackforge/fuel-nailgun-agent.git
ASTUTE_REPO?=https://github.com/stackforge/fuel-astute.git
OSTF_REPO?=https://github.com/stackforge/fuel-ostf.git
CREATEMIRROR_REPO?=https://github.com/stackforge/fuel-mirror.git
# Gerrit URLs and commits
FUELLIB_GERRIT_URL?=https://review.openstack.org/stackforge/fuel-library
@ -115,6 +117,7 @@ FUEL_AGENT_GERRIT_URL?=https://review.openstack.org/stackforge/fuel-agent
FUEL_NAILGUN_AGENT_GERRIT_URL?=https://review.openstack.org/stackforge/fuel-nailgun-agent
ASTUTE_GERRIT_URL?=https://review.openstack.org/stackforge/fuel-astute
OSTF_GERRIT_URL?=https://review.openstack.org/stackforge/fuel-ostf
CREATEMIRROR_GERRIT_URL?=https://review.openstack.org/stackforge/fuel-mirror
FUELLIB_GERRIT_COMMIT?=none
NAILGUN_GERRIT_COMMIT?=none
@ -123,6 +126,7 @@ FUEL_AGENT_GERRIT_COMMIT?=none
FUEL_NAILGUN_AGENT_GERRIT_COMMIT?=none
ASTUTE_GERRIT_COMMIT?=none
OSTF_GERRIT_COMMIT?=none
CREATEMIRROR_GERRIT_COMMIT?=none
FUELMAIN_GERRIT_COMMIT?=none
LOCAL_MIRROR_CENTOS:=$(LOCAL_MIRROR)/centos

View File

@ -72,6 +72,6 @@ $(BUILD_DIR)/packages/deb/repocleanup.done: $(packages_list:%=$(BUILD_DIR)/packa
$(BUILD_DIR)/packages/deb/build.done:
$(ACTION.TOUCH)
fuel_debian_packages:=fuel-nailgun astute fuel-agent fuel-library$(PRODUCT_VERSION) fuel-nailgun-agent
fuel_debian_packages:=fuel-nailgun astute fuel-agent fuel-library$(PRODUCT_VERSION) fuel-nailgun-agent fuel-createmirror
$(eval $(foreach pkg,$(fuel_debian_packages),$(call build_deb,$(pkg))$(NEWLINE)))

View File

@ -75,6 +75,8 @@ $(eval $(call prepare_git_source,fuel-agent,fuel-agent-$(PACKAGE_VERSION).tar.gz
$(eval $(call prepare_git_source,fuel-nailgun-agent,fuel-nailgun-agent-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuel-nailgun-agent,HEAD,$(FUEL_NAILGUN_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)))
#FUEL-CREATEMIRROR PKGS
$(eval $(call prepare_git_source,fuel-createmirror,fuel-createmirror-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuel-createmirror,HEAD,$(CREATEMIRROR_GERRIT_COMMIT)))
include $(SOURCE_DIR)/packages/rpm/module.mk
include $(SOURCE_DIR)/packages/deb/module.mk

View File

@ -85,7 +85,8 @@ fuel-main \
fuel-nailgun-agent \
fuel-ostf \
fuel-nailgun \
python-fuelclient
python-fuelclient \
fuel-createmirror
$(eval $(foreach pkg,$(packages_list),$(call build_rpm,$(pkg))$(NEWLINE)))

View File

@ -45,6 +45,7 @@ $(eval $(call build_repo,fuel-nailgun-agent,$(FUEL_NAILGUN_AGENT_REPO),$(FUEL_NA
$(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)))
$(eval $(call build_repo,fuel-createmirror,$(CREATEMIRROR_REPO),$(CREATEMIRROR_COMMIT),$(CREATEMIRROR_GERRIT_URL),$(CREATEMIRROR_GERRIT_COMMIT)))
$(BUILD_DIR)/repos/fuel-main.done:
ln -s $(SOURCE_DIR) $(BUILD_DIR)/repos/fuel-main

View File

@ -30,10 +30,6 @@ erlang
ethtool
euca2ools
fence-agents
fuel-createmirror
fuel-library
fuelmenu
fuel-ostf
gcc
gdisk
genisoimage
@ -75,8 +71,6 @@ monit
mtools
MySQL-python
MySQL-shared-wsrep
nailgun-agent
nailgun-mcagents
nginx
nmap-ncat
nodejs-backbone
@ -165,7 +159,6 @@ python-ethtool
python-eventlet
python-fabric
python-flask
python-fuelclient
python-futures
python-fysom
python-gevent
@ -279,7 +272,6 @@ ruby21-rubygem-activesupport
ruby21-rubygem-amq-client
ruby21-rubygem-amqp
ruby21-rubygem-amq-protocol
ruby21-rubygem-astute
ruby21-rubygem-eventmachine
ruby21-rubygem-i18n
ruby21-rubygem-json