From bcb740d3d11239e41ce9e993e0e141ef9255ccf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20P=C3=A9riard-Tremblay?= Date: Mon, 27 Feb 2017 15:49:10 -0500 Subject: [PATCH] Update test kitchen configuration and directory layout --- apache/.kitchen.yml | 5 ++++- apache/{test/integration/default.yml => tests/test.yml} | 0 nginx/.kitchen.yml | 5 ++++- nginx/{test/integration/default.yml => tests/test.yml} | 0 nodejs/.kitchen.yml | 5 ++++- nodejs/{test/integration/default.yml => tests/test.yml} | 0 6 files changed, 12 insertions(+), 3 deletions(-) rename apache/{test/integration/default.yml => tests/test.yml} (100%) rename nginx/{test/integration/default.yml => tests/test.yml} (100%) rename nodejs/{test/integration/default.yml => tests/test.yml} (100%) diff --git a/apache/.kitchen.yml b/apache/.kitchen.yml index 680b177e..af2a6389 100644 --- a/apache/.kitchen.yml +++ b/apache/.kitchen.yml @@ -11,7 +11,6 @@ provisioner: ansible_verbose: true require_ansible_source: true install_source_rev: "stable-2.0.0.1" - idempotency_test: true require_chef_for_busser: false platforms: @@ -19,3 +18,7 @@ platforms: suites: - name: default + provisioner: + name: ansible_playbook + playbook: ./tests/test.yml + idempotency_test: true diff --git a/apache/test/integration/default.yml b/apache/tests/test.yml similarity index 100% rename from apache/test/integration/default.yml rename to apache/tests/test.yml diff --git a/nginx/.kitchen.yml b/nginx/.kitchen.yml index 680b177e..af2a6389 100644 --- a/nginx/.kitchen.yml +++ b/nginx/.kitchen.yml @@ -11,7 +11,6 @@ provisioner: ansible_verbose: true require_ansible_source: true install_source_rev: "stable-2.0.0.1" - idempotency_test: true require_chef_for_busser: false platforms: @@ -19,3 +18,7 @@ platforms: suites: - name: default + provisioner: + name: ansible_playbook + playbook: ./tests/test.yml + idempotency_test: true diff --git a/nginx/test/integration/default.yml b/nginx/tests/test.yml similarity index 100% rename from nginx/test/integration/default.yml rename to nginx/tests/test.yml diff --git a/nodejs/.kitchen.yml b/nodejs/.kitchen.yml index 680b177e..af2a6389 100644 --- a/nodejs/.kitchen.yml +++ b/nodejs/.kitchen.yml @@ -11,7 +11,6 @@ provisioner: ansible_verbose: true require_ansible_source: true install_source_rev: "stable-2.0.0.1" - idempotency_test: true require_chef_for_busser: false platforms: @@ -19,3 +18,7 @@ platforms: suites: - name: default + provisioner: + name: ansible_playbook + playbook: ./tests/test.yml + idempotency_test: true diff --git a/nodejs/test/integration/default.yml b/nodejs/tests/test.yml similarity index 100% rename from nodejs/test/integration/default.yml rename to nodejs/tests/test.yml