From 462f32cf15d53e7279442c4ca770e0e3e13f7e96 Mon Sep 17 00:00:00 2001
From: Maxim Kulkin <mkulkin@mirantis.com>
Date: Wed, 15 Aug 2012 19:17:09 +0400
Subject: [PATCH] Moved cookbook tests to product-cookbooks repository

---
 Makefile       |  2 +-
 cooks          |  2 +-
 test/module.mk | 21 ++-------------------
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/Makefile b/Makefile
index 8ef5c3674d..d44c663092 100644
--- a/Makefile
+++ b/Makefile
@@ -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
 
diff --git a/cooks b/cooks
index a8caabe319..496bc080fb 160000
--- a/cooks
+++ b/cooks
@@ -1 +1 @@
-Subproject commit a8caabe3196eb86c528b290b001d1bf13c7cd65f
+Subproject commit 496bc080fb19a89b4c5014110b97696419c9c53d
diff --git a/test/module.mk b/test/module.mk
index 6c631b621f..81c840f552 100644
--- a/test/module.mk
+++ b/test/module.mk
@@ -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
-