openstack
/
fuel-web
Code Issues Proposed changes

Merge pull request #130 from Mirantis/mkulkin 

Moved cookbook tests to product-cookbooks repository
This commit is contained in:
Roman Alekseenkov 2012-08-15 17:48:57 -07:00
parent 2d2ced090f 462f32cf15
commit db670a12a3
3 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -1,7 +1,7 @@
BUILD_DIR:=build
MODULES=gnupg bootstrap nailgun test os os/centos os/ubuntu iso
MODULES=gnupg bootstrap nailgun test os os/centos os/ubuntu iso cooks
.PHONY: all clean test test-unit help FORCE
@ -34,7 +34,19 @@ find-files=$(shell test -d $1 && cd $1 && find * -type f 2> /dev/null)
include config.mk
include $(addsuffix /module.mk,$(MODULES))
define include-module-template
MODULE_SOURCE_DIR:=$1
MODULE_BUILD_DIR:=$(BUILD_DIR)/$1
.:=$$(MODULE_SOURCE_DIR)
/:=$$(MODULE_BUILD_DIR)/
$$/%: .:=$$.
$$/%: /:=$$/
include $1/module.mk
endef
include-module=$(eval $(call include-module-template,$1))
$(foreach module,$(MODULES),$(call include-module,$(module)))
include rules.mk

2
cooks

@ -1 +1 @@
Subproject commit a8caabe3196eb86c528b290b001d1bf13c7cd65f
Subproject commit 496bc080fb19a89b4c5014110b97696419c9c53d

21
test/module.mk
View File

@ -10,9 +10,9 @@ CHEF_TIMEOUT ?= 600
$/%: /:=$/
test: test-integration test-cookbooks
test: test-integration
clean: clean-integration-test clean-cookbooks-test
clean: clean-integration-test
.PHONY: test-integration
@ -34,20 +34,3 @@ clean-integration-test:
.PHONY: test-cookbooks
test-cookbooks: $/environment-id-cookbooks $(centos.packages)/Packages/repodata/repomd.xml
python test/integration_test.py -l $(LEVEL) --cache-file $(abspath $<) --iso $(image.centos.url) --suite cookbooks test $(NOSEARGS)
$/environment-id-cookbooks:
@mkdir -p $(@D)
python test/integration_test.py -l $(LEVEL) --cache-file $(abspath $@) --suite cookbooks destroy
python test/integration_test.py -l $(LEVEL) --cache-file $(abspath $@) --iso $(image.centos.url) --suite cookbooks setup
.PHONY: clean-cookbooks-test
clean-cookbooks-test: /:=$/
clean-cookbooks-test:
test -f $/environment-id-cookbooks.candidate && \
python test/integration_test.py -l $(LEVEL) --cache-file $(abspath $/environment-id-cookbooks.candidate) --suite cookbooks destroy || true
test -f $/environment-id-cookbooks && \
python test/integration_test.py -l $(LEVEL) --cache-file $(abspath $/environment-id-cookbooks) --suite cookbooks destroy || true