From 69b2d82be6ffe20f04070cddf11b7629aa8420e5 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Thu, 20 Feb 2014 13:00:05 -0500 Subject: [PATCH] Convert test system to use Make --- tests_new/integration/Makefile | 4 ++++ tests_new/integration/README.md | 7 ++++--- tests_new/integration/test.sh | 1 - 3 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 tests_new/integration/Makefile delete mode 100755 tests_new/integration/test.sh diff --git a/tests_new/integration/Makefile b/tests_new/integration/Makefile new file mode 100644 index 0000000000..7333ac91af --- /dev/null +++ b/tests_new/integration/Makefile @@ -0,0 +1,4 @@ +all: non_destructive destructive # amazon rackspace + +non_destructive: + ansible-playbook non_destructive.yml -i inventory -e @integration_config.yml -v $(TEST_FLAGS) diff --git a/tests_new/integration/README.md b/tests_new/integration/README.md index 03a41e5cf8..26461d546d 100644 --- a/tests_new/integration/README.md +++ b/tests_new/integration/README.md @@ -30,18 +30,19 @@ outside of those test subdirectories. They will also not reconfigure or bounce Run as follows: - # sh test.sh # OR - # ansible-playbook non_destructive.yml -i inventory -e @integration_config.yml -v $* + make non_destructive You can select specific tests with the --tags parameter. + TEST_FLAGS="--tags test_vars_blending" make + Destructive Tests ================= These tests are allowed to install and remove some trivial packages. You will likely want to devote these to a virtual environment. They won't reformat your filesystem, however :) - # ansible-playbook destructive.yml -i inventory -e @integration_config.yml -v $* + make destructive Cloud Tests =========== diff --git a/tests_new/integration/test.sh b/tests_new/integration/test.sh deleted file mode 100755 index 1fce04d5b2..0000000000 --- a/tests_new/integration/test.sh +++ /dev/null @@ -1 +0,0 @@ -ansible-playbook non_destructive.yml -i inventory -e @integration_config.yml -v $*