openstack
/
fuel-main
Code Issues Proposed changes

Update makesystem for usig of fuel-ostf-tests repo 

config.mk:
* Change using of OSTF repos to FUEL_OSTF_REPO
* Change usgae of Plugin and tests sha to FUEL_OSTF_COMMIT origin/master

repos.mk:
* Change build repo to build fuel-ostf repo from one repo

packages/eggs.module.mk:
* Change eval func to build fuel_ostf egg from fuel-ostf repo

Change-Id: I295de3feb5eff339a4c4d39dbbee1718a4d07c8a
Fixes: OSTF-237
This commit is contained in:
Tatyanka 2013-09-27 19:39:52 +03:00 committed by Dmitry Pyzhov
parent 7158abf93a
commit e1fd7cf63f
5 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config.mk
View File

@ -42,15 +42,12 @@ CACHE_RHEL:=0
NAILGUN_COMMIT?=origin/master
ASTUTE_COMMIT?=origin/master
FUELLIB_COMMIT?=origin/master
OSTF_TESTS_COMMIT?=92b4e5e8d10f1a45f7433d06eb3a5936adb4050e
OSTF_PLUGIN_COMMIT?=f1c7870793a3aa724673c30391d3255a0d9465d5
OSTF_COMMIT?=origin/master
NAILGUN_REPO?=https://github.com/Mirantis/fuelweb.git
ASTUTE_REPO?=https://github.com/Mirantis/astute.git
FUELLIB_REPO?=https://github.com/Mirantis/fuel.git
OSTF_TESTS_REPO?=https://github.com/Mirantis/fuel-ostf-tests.git
OSTF_PLUGIN_REPO?=https://github.com/Mirantis/fuel-ostf-plugin.git
OSTF_REPO?=https://github.com/Mirantis/fuel-ostf-tests.git
LOCAL_MIRROR_SRC:=$(LOCAL_MIRROR)/src
LOCAL_MIRROR_EGGS:=$(LOCAL_MIRROR)/eggs

3
packages/eggs/module.mk
View File

@ -34,8 +34,7 @@ $(BUILD_DIR)/packages/eggs/$3-$4.tar.gz: $(LOCAL_MIRROR_SRC)/$2.zip
endef
# OSTF eggs version are hardcoded here and in fuel/deployment/puppet/nailgun/manifests/ostf.pp
$(eval $(call build_repo_egg,ostf_tests,ostf_tests,0.1))
$(eval $(call build_repo_egg,ostf_plugin,testing_adapter,0.2))
$(eval $(call build_repo_egg,ostf,fuel-ostf,0.1))
$(eval $(call build_egg,GateOne,bb003114b4e84e9425fd02fd1ee615d4dd2113e7,gateone,1.2.0))
nailgun: $(BUILD_DIR)/packages/eggs/nailgun.done

3
repos.mk
View File

@ -28,5 +28,4 @@ endef
$(eval $(call build_repo,nailgun,$(NAILGUN_REPO),$(NAILGUN_COMMIT)))
$(eval $(call build_repo,astute,$(ASTUTE_REPO),$(ASTUTE_COMMIT)))
$(eval $(call build_repo,fuellib,$(FUELLIB_REPO),$(FUELLIB_COMMIT)))
$(eval $(call build_repo,ostf_tests,$(OSTF_TESTS_REPO),$(OSTF_TESTS_COMMIT)))
$(eval $(call build_repo,ostf_plugin,$(OSTF_PLUGIN_REPO),$(OSTF_PLUGIN_COMMIT)))
$(eval $(call build_repo,ostf,$(OSTF_REPO),$(OSTF_COMMIT)))

5
requirements-eggs.txt
View File

@ -20,11 +20,12 @@ nose2==0.4.1
nose==1.1.2
ordereddict==1.1
pip==1.2.1
prettytable==0.6.1
psycopg2==2.4.6
pycrypto==2.6
python-heatclient==0.2.2
python-heatclient==0.2.4
python-muranoclient==0.2
prettytable==0.6.1
requests==1.1.0
simplejson==2.6.2
six==1.1.0
tornado==3.0

2
requirements-test-eggs.txt
View File

@ -2,4 +2,4 @@ nose2==0.4.1
nose==1.1.2
nose-timer==0.1.2
nose-exclude==0.1.5
mock==1.0.1
mock==1.0.1