openstack/fuel-web
Code Issues Proposed changes

Moved cookbook tests to product-cookbooks repository

Browse Source
This commit is contained in:
Maxim Kulkin 2012-08-15 19:17:09 +04:00
parent f169aeb228
commit 462f32cf15
3 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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

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