Move all shared tests into the shared test helper

test/integration/oss-to-xpack-upgrade.yml

@@ -1,22 +1,24 @@
 ---
 - name: Standard test for single node setup. Tests idempotence.
   hosts: localhost
-  tasks:
+  post_tasks:
     - include: elasticsearch/test/integration/debug.yml
   roles:
-    - { role: elasticsearch, es_instance_name: "node1" }
+    - elasticsearch
   vars:
+    es_instance_name: "node1"
     es_version: "{{ '6.2.4' if es_major_version == '6.x' else '5.6.9' }}" # This is set to an older version than the current default to force an upgrade
     es_enable_xpack: false
     es_heap_size: "1g"
 
 - name: Standard test for single node setup. Tests idempotence.
   hosts: localhost
-  tasks:
+  post_tasks:
     - include: elasticsearch/test/integration/debug.yml
   roles:
-    - { role: elasticsearch, es_instance_name: "node1" }
+    - elasticsearch
   vars:
+    es_instance_name: "node1"
     es_enable_xpack: true
     es_api_basic_auth_username: elastic
     es_api_basic_auth_password: changeme