From 06d156fd578fd20d0075bb892cfbd2135e83d4c7 Mon Sep 17 00:00:00 2001
From: Dale McDiarmid <dalem@elastic.co>
Date: Fri, 6 Jan 2017 11:24:52 +0000
Subject: [PATCH] Moving to 5.x tests

---
 .kitchen.yml                                           | 10 +++++-----
 meta/main.yml                                          |  2 +-
 test/integration/{config-2x => config-5x}/config.yml   |  0
 .../serverspec/default_spec.rb                         |  0
 test/integration/{multi-2x => multi-5x}/multi.yml      |  0
 .../{multi-2x => multi-5x}/serverspec/default_spec.rb  |  0
 .../{package-2x => package-5x}/package.yaml            |  0
 .../serverspec/default_spec.rb                         |  0
 .../serverspec/default_spec.rb                         |  0
 .../{standard-2x => standard-5x}/standard.yml          |  0
 .../{xpack-2x => xpack-5x}/serverspec/default_spec.rb  |  0
 test/integration/{xpack-2x => xpack-5x}/xpack.yml      |  0
 12 files changed, 6 insertions(+), 6 deletions(-)
 rename test/integration/{config-2x => config-5x}/config.yml (100%)
 rename test/integration/{config-2x => config-5x}/serverspec/default_spec.rb (100%)
 rename test/integration/{multi-2x => multi-5x}/multi.yml (100%)
 rename test/integration/{multi-2x => multi-5x}/serverspec/default_spec.rb (100%)
 rename test/integration/{package-2x => package-5x}/package.yaml (100%)
 rename test/integration/{package-2x => package-5x}/serverspec/default_spec.rb (100%)
 rename test/integration/{standard-2x => standard-5x}/serverspec/default_spec.rb (100%)
 rename test/integration/{standard-2x => standard-5x}/standard.yml (100%)
 rename test/integration/{xpack-2x => xpack-5x}/serverspec/default_spec.rb (100%)
 rename test/integration/{xpack-2x => xpack-5x}/xpack.yml (100%)

diff --git a/.kitchen.yml b/.kitchen.yml
index 0284b0b..4c09c0a 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -64,12 +64,12 @@ platforms:
       use_sudo: false
 
 suites:
-  - name: standard-2x
+  - name: standard-5x
     provisioner:
       playbook: test/integration/standard.yml
     run_list:
     attributes:
-  - name: package-2x
+  - name: package-5x
     run_list:
     attributes:
       extra_vars:
@@ -78,12 +78,12 @@ suites:
             version: master
     provisioner:
       playbook: test/integration/package.yml
-  - name: config-2x
+  - name: config-5x
     run_list:
     attributes:
     provisioner:
       playbook: test/integration/config.yml
-  - name: multi-2x
+  - name: multi-5x
     run_list:
     attributes:
       extra_vars:
@@ -92,7 +92,7 @@ suites:
             version: master
     provisioner:
       playbook: test/integration/multi.yml
-  - name: xpack-2x
+  - name: xpack-5x
     run_list:
     attributes:
     provisioner:
diff --git a/meta/main.yml b/meta/main.yml
index fe062a5..edd7295 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -8,7 +8,7 @@ galaxy_info:
   company: "Elastic.co"
   license: "license (Apache)"
   # Require 1.6 for apt deb install
-  min_ansible_version: 2.1.0
+  min_ansible_version: 2.2.0
   platforms:
   - name: EL
     versions:
diff --git a/test/integration/config-2x/config.yml b/test/integration/config-5x/config.yml
similarity index 100%
rename from test/integration/config-2x/config.yml
rename to test/integration/config-5x/config.yml
diff --git a/test/integration/config-2x/serverspec/default_spec.rb b/test/integration/config-5x/serverspec/default_spec.rb
similarity index 100%
rename from test/integration/config-2x/serverspec/default_spec.rb
rename to test/integration/config-5x/serverspec/default_spec.rb
diff --git a/test/integration/multi-2x/multi.yml b/test/integration/multi-5x/multi.yml
similarity index 100%
rename from test/integration/multi-2x/multi.yml
rename to test/integration/multi-5x/multi.yml
diff --git a/test/integration/multi-2x/serverspec/default_spec.rb b/test/integration/multi-5x/serverspec/default_spec.rb
similarity index 100%
rename from test/integration/multi-2x/serverspec/default_spec.rb
rename to test/integration/multi-5x/serverspec/default_spec.rb
diff --git a/test/integration/package-2x/package.yaml b/test/integration/package-5x/package.yaml
similarity index 100%
rename from test/integration/package-2x/package.yaml
rename to test/integration/package-5x/package.yaml
diff --git a/test/integration/package-2x/serverspec/default_spec.rb b/test/integration/package-5x/serverspec/default_spec.rb
similarity index 100%
rename from test/integration/package-2x/serverspec/default_spec.rb
rename to test/integration/package-5x/serverspec/default_spec.rb
diff --git a/test/integration/standard-2x/serverspec/default_spec.rb b/test/integration/standard-5x/serverspec/default_spec.rb
similarity index 100%
rename from test/integration/standard-2x/serverspec/default_spec.rb
rename to test/integration/standard-5x/serverspec/default_spec.rb
diff --git a/test/integration/standard-2x/standard.yml b/test/integration/standard-5x/standard.yml
similarity index 100%
rename from test/integration/standard-2x/standard.yml
rename to test/integration/standard-5x/standard.yml
diff --git a/test/integration/xpack-2x/serverspec/default_spec.rb b/test/integration/xpack-5x/serverspec/default_spec.rb
similarity index 100%
rename from test/integration/xpack-2x/serverspec/default_spec.rb
rename to test/integration/xpack-5x/serverspec/default_spec.rb
diff --git a/test/integration/xpack-2x/xpack.yml b/test/integration/xpack-5x/xpack.yml
similarity index 100%
rename from test/integration/xpack-2x/xpack.yml
rename to test/integration/xpack-5x/xpack.yml