Use inventory for variables rather than vars files (#158)

stewartfrancis · web-flow · commit 878e589e01c8 · 2025-02-06T10:11:27.000Z
* Use inventory for variables rather than vars files

* escape dollar sign for template processing

Signed-off-by: Stewart Francis &lt;stewartfrancis@uk.ibm.com&gt;

* Use a shared var in template for unique 5 char base

Signed-off-by: Stewart Francis &lt;stewartfrancis@uk.ibm.com&gt;

* fix yamllint issues in template inventory

Signed-off-by: Stewart Francis &lt;stewartfrancis@uk.ibm.com&gt;

* Run CMCI playbooks against all, use delegation, so we get host vars

Signed-off-by: Stewart Francis &lt;stewartfrancis@uk.ibm.com&gt;

* remove references to inventory and vars

Signed-off-by: Stewart Francis &lt;stewartfrancis@uk.ibm.com&gt;

* fix test issues

Signed-off-by: Stewart Francis &lt;stewartfrancis@uk.ibm.com&gt;

* force creation of member

Signed-off-by: Stewart Francis &lt;stewartfrancis@uk.ibm.com&gt;

* update tests to remove decho

Signed-off-by: Stewart Francis &lt;stewartfrancis@uk.ibm.com&gt;

---------

Signed-off-by: Stewart Francis &lt;stewartfrancis@uk.ibm.com&gt;
diff --git a/tests/integration/targets/cics_cmci/playbooks/cics_cmci_http.yml b/tests/integration/targets/cics_cmci/playbooks/cics_cmci_http.yml
@@ -2,7 +2,7 @@
 # Apache License, Version 2.0 (see https://opensource.org/licenses/Apache-2.0)
 ---
 - name: CMCI HTTP Integration Test
-  hosts: localhost
+  hosts: all
   gather_facts: false
   vars:
     csdgroup: "{{ cmci_program_name_1 }}"
diff --git a/tests/integration/targets/cics_cmci/playbooks/cics_cmci_https.yml b/tests/integration/targets/cics_cmci/playbooks/cics_cmci_https.yml
@@ -2,7 +2,7 @@
 # Apache License, Version 2.0 (see https://opensource.org/licenses/Apache-2.0)
 ---
 - name: CMCI HTTPS Integration Test
-  hosts: localhost
+  hosts: all
   gather_facts: false
   vars:
     csdgroup: "{{ cmci_program_name_1 }}"
diff --git a/tests/integration/targets/cics_cmci/playbooks/cics_cmci_module_defaults_cmci.yml b/tests/integration/targets/cics_cmci/playbooks/cics_cmci_module_defaults_cmci.yml
@@ -2,7 +2,7 @@
 # Apache License, Version 2.0 (see https://opensource.org/licenses/Apache-2.0)
 ---
 - name: CMCI Group Module_Default Integration Tests
-  hosts: localhost
+  hosts: all
   gather_facts: false
   vars:
     csdgroup: "{{ cmci_program_name_1 }}"
diff --git a/tests/integration/targets/cics_cmci/playbooks/cics_cmci_module_defaults_cmci_group.yml b/tests/integration/targets/cics_cmci/playbooks/cics_cmci_module_defaults_cmci_group.yml
@@ -2,7 +2,7 @@
 # Apache License, Version 2.0 (see https://opensource.org/licenses/Apache-2.0)
 ---
 - name: CMCI Group Module_Default Integration Tests
-  hosts: localhost
+  hosts: all
   gather_facts: false
   vars:
     csdgroup: "{{ cmci_program_name_1 }}"
diff --git a/tests/integration/targets/cics_cmci/playbooks/cmci_bas_install.yml b/tests/integration/targets/cics_cmci/playbooks/cmci_bas_install.yml
@@ -5,7 +5,7 @@
   # Sets Up a full BAS resource assignment deployment. Checks to see where programs will be installed and then
   # installs to two regions with a target scope and one related scope. Uninstalls and deletes everything created after
 
-  hosts: localhost
+  hosts: all
   gather_facts: false
   vars:
     program: "{{ cmci_program_name_1 }}"
diff --git a/tests/integration/targets/cics_cmci/playbooks/cmci_bas_install_error.yml b/tests/integration/targets/cics_cmci/playbooks/cmci_bas_install_error.yml
@@ -6,7 +6,7 @@
   # installs to two regions with a target scope and one related scope. Then attempts to install again and checks an error
   # occured with feedback and nested installerrors. Uninstalls and deletes everything created after
 
-  hosts: localhost
+  hosts: all
   gather_facts: false
   vars:
     file1: "{{ cmci_program_name_1 }}"
diff --git a/tests/integration/targets/cics_cmci/playbooks/cmci_bas_link.yml b/tests/integration/targets/cics_cmci/playbooks/cmci_bas_link.yml
@@ -4,7 +4,7 @@
 - name: CMCI BAS Link Integration Test
   # Sets Up a Basic BAS Resource Description with one Resource Group containing one program definition and then cleans up
 
-  hosts: localhost
+  hosts: all
   gather_facts: false
   vars:
     program: "{{ cmci_program_name_1 }}"
diff --git a/tests/integration/targets/cics_cmci/playbooks/cmci_create_pipeline_failure.yml b/tests/integration/targets/cics_cmci/playbooks/cmci_create_pipeline_failure.yml
@@ -2,11 +2,12 @@
 # Apache License, Version 2.0 (see https://opensource.org/licenses/Apache-2.0)
 ---
 - name: CMCI Create Pipeline Failure Integration Test
-  hosts: localhost
+  hosts: all
   gather_facts: false
 
   tasks:
     - name: Test create pipeline failure
+      delegate_to: localhost
       ibm.ibm_zos_cics.cmci_create:
         cmci_host: "{{ cmci_host }}"
         cmci_port: "{{ cmci_secure_port }}"
diff --git a/tests/integration/targets/cics_cmci/playbooks/cmci_incorrect_context.yml b/tests/integration/targets/cics_cmci/playbooks/cmci_incorrect_context.yml
@@ -2,11 +2,12 @@
 # Apache License, Version 2.0 (see https://opensource.org/licenses/Apache-2.0)
 ---
 - name: CMCI Incorrect Context Integration Test
-  hosts: localhost
+  hosts: all
   gather_facts: false
 
   tasks:
     - name: Test invalid context
+      delegate_to: localhost
       ibm.ibm_zos_cics.cmci_get:
         cmci_host: "{{ cmci_host }}"
         cmci_port: "{{ cmci_secure_port }}"
diff --git a/tests/integration/targets/cics_cmci/playbooks/cmci_incorrect_host.yml b/tests/integration/targets/cics_cmci/playbooks/cmci_incorrect_host.yml
@@ -2,11 +2,12 @@
 # Apache License, Version 2.0 (see https://opensource.org/licenses/Apache-2.0)
 ---
 - name: CMCI Incorrect Host Integration Test
-  hosts: localhost
+  hosts: all
   gather_facts: false
 
   tasks:
     - name: Test invalid host
+      delegate_to: localhost
       ibm.ibm_zos_cics.cmci_get:
         cmci_host: DOESNTEXIST
         cmci_port: "{{ cmci_secure_port }}"
diff --git a/tests/integration/targets/cics_cmci/playbooks/cmci_incorrect_port.yml b/tests/integration/targets/cics_cmci/playbooks/cmci_incorrect_port.yml
@@ -2,11 +2,12 @@
 # Apache License, Version 2.0 (see https://opensource.org/licenses/Apache-2.0)
 ---
 - name: CMCI Incorrect Port Integration Test
-  hosts: localhost
+  hosts: all
   gather_facts: false
 
   tasks:
     - name: Test incorrect port
+      delegate_to: localhost
       ibm.ibm_zos_cics.cmci_get:
         cmci_host: "{{ cmci_host }}"
         cmci_port: 12345
diff --git a/tests/integration/targets/cics_cmci/playbooks/cmci_incorrect_scheme.yml b/tests/integration/targets/cics_cmci/playbooks/cmci_incorrect_scheme.yml
@@ -2,7 +2,7 @@
 # Apache License, Version 2.0 (see https://opensource.org/licenses/Apache-2.0)
 ---
 - name: CMCI Incorrect Scheme Integration Test
-  hosts: localhost
+  hosts: all
   gather_facts: true
   vars:
     python_2_message: >-
@@ -16,6 +16,7 @@
 
   tasks:
     - name: Test https with incorrect scheme
+      delegate_to: localhost
       ibm.ibm_zos_cics.cmci_get:
         cmci_host: "{{ cmci_host }}"
         cmci_port: "{{ cmci_secure_port }}"
@@ -36,6 +37,7 @@
           - result.msg == error_message
 
     - name: Test http with incorrect scheme
+      delegate_to: localhost
       ibm.ibm_zos_cics.cmci_get:
         cmci_host: "{{ cmci_host }}"
         cmci_port: "{{ cmci_port }}"
diff --git a/tests/integration/targets/cics_cmci/playbooks/cmci_incorrect_scope.yml b/tests/integration/targets/cics_cmci/playbooks/cmci_incorrect_scope.yml
@@ -2,11 +2,12 @@
 # Apache License, Version 2.0 (see https://opensource.org/licenses/Apache-2.0)
 ---
 - name: CMCI Incorrect Scope Integration Test
-  hosts: localhost
+  hosts: all
   gather_facts: false
 
   tasks:
     - name: Test invalid scope
+      delegate_to: localhost
       ibm.ibm_zos_cics.cmci_get:
         cmci_host: "{{ cmci_host }}"
         cmci_port: "{{ cmci_secure_port }}"
diff --git a/tests/integration/targets/cics_cmci/playbooks/cmci_insecure_false.yml b/tests/integration/targets/cics_cmci/playbooks/cmci_insecure_false.yml
@@ -2,11 +2,12 @@
 # Apache License, Version 2.0 (see https://opensource.org/licenses/Apache-2.0)
 ---
 - name: CMCI Insecure False Integration Test
-  hosts: localhost
+  hosts: all
   gather_facts: false
 
   tasks:
     - name: Test insecure false
+      delegate_to: localhost
       ibm.ibm_zos_cics.cmci_get:
         cmci_host: "{{ cmci_host }}"
         cmci_port: "{{ cmci_secure_port }}"
diff --git a/tests/integration/targets/cics_cmci/playbooks/cmci_install_bundle_failure.yml b/tests/integration/targets/cics_cmci/playbooks/cmci_install_bundle_failure.yml
@@ -2,7 +2,7 @@
 # Apache License, Version 2.0 (see https://opensource.org/licenses/Apache-2.0)
 ---
 - name: CMCI Install Bundle Failure Integration Test
-  hosts: localhost
+  hosts: all
   gather_facts: false
   vars:
     csdgroup: "{{ cmci_program_name_1 }}"
diff --git a/tests/integration/targets/cics_cmci/playbooks/cmci_invalid_credentials.yml b/tests/integration/targets/cics_cmci/playbooks/cmci_invalid_credentials.yml
@@ -2,14 +2,15 @@
 # Apache License, Version 2.0 (see https://opensource.org/licenses/Apache-2.0)
 ---
 - name: CMCI Invalid Credentials Integration Test
-  hosts: localhost
+  hosts: all
   gather_facts: false
 
   vars:
     fail_message: CMCI request returned non-OK status{{':'}} Unauthorized
 
   tasks:
     - name: Test incorrect username
+      delegate_to: localhost
       ibm.ibm_zos_cics.cmci_get:
         cmci_host: "{{ cmci_host }}"
         cmci_port: "{{ cmci_secure_port }}"
diff --git a/tests/integration/targets/cics_cmci/runme.sh b/tests/integration/targets/cics_cmci/runme.sh
@@ -3,21 +3,21 @@
 # Apache License, Version 2.0 (see https://opensource.org/licenses/Apache-2.0)
 set -eux # This is important to ensure that return codes from failing tests are propagated
 
-VAR_PATH="$ANSIBLE_COLLECTIONS_PATH/ansible_collections/ibm/ibm_zos_cics/tests/integration/variables/cmci.yml"
+export ANSIBLE_INVENTORY="$ANSIBLE_COLLECTIONS_PATH/ansible_collections/ibm/ibm_zos_cics/tests/integration/inventory_zos.yml"
 
-ansible-playbook -e "@$VAR_PATH" playbooks/cics_cmci_https.yml
-ansible-playbook -e "@$VAR_PATH" playbooks/cmci_insecure_false.yml
-ansible-playbook -e "@$VAR_PATH" playbooks/cmci_incorrect_port.yml
-ansible-playbook -e "@$VAR_PATH" playbooks/cmci_incorrect_host.yml
-ansible-playbook -e "@$VAR_PATH" playbooks/cmci_invalid_credentials.yml
-ansible-playbook -e "@$VAR_PATH" playbooks/cmci_incorrect_scope.yml
-ansible-playbook -e "@$VAR_PATH" playbooks/cmci_incorrect_context.yml
-ansible-playbook -e "@$VAR_PATH" playbooks/cics_cmci_http.yml
-ansible-playbook -e "@$VAR_PATH" playbooks/cmci_install_bundle_failure.yml
-ansible-playbook -e "@$VAR_PATH" playbooks/cmci_create_pipeline_failure.yml
-ansible-playbook -e "@$VAR_PATH" playbooks/cmci_incorrect_scheme.yml
-ansible-playbook -e "@$VAR_PATH" playbooks/cmci_bas_link.yml
-ansible-playbook -e "@$VAR_PATH" playbooks/cmci_bas_install.yml
-ansible-playbook -e "@$VAR_PATH" playbooks/cmci_bas_install_error.yml
-ansible-playbook -e "@$VAR_PATH" playbooks/cics_cmci_module_defaults_cmci.yml
-ansible-playbook -e "@$VAR_PATH" playbooks/cics_cmci_module_defaults_cmci_group.yml
+ansible-playbook playbooks/cics_cmci_https.yml
+ansible-playbook playbooks/cmci_insecure_false.yml
+ansible-playbook playbooks/cmci_incorrect_port.yml
+ansible-playbook playbooks/cmci_incorrect_host.yml
+ansible-playbook playbooks/cmci_invalid_credentials.yml
+ansible-playbook playbooks/cmci_incorrect_scope.yml
+ansible-playbook playbooks/cmci_incorrect_context.yml
+ansible-playbook playbooks/cics_cmci_http.yml
+ansible-playbook playbooks/cmci_install_bundle_failure.yml
+ansible-playbook playbooks/cmci_create_pipeline_failure.yml
+ansible-playbook playbooks/cmci_incorrect_scheme.yml
+ansible-playbook playbooks/cmci_bas_link.yml
+ansible-playbook playbooks/cmci_bas_install.yml
+ansible-playbook playbooks/cmci_bas_install_error.yml
+ansible-playbook playbooks/cics_cmci_module_defaults_cmci.yml
+ansible-playbook playbooks/cics_cmci_module_defaults_cmci_group.yml
diff --git a/tests/integration/targets/cics_cmci_missing_requests_library/runme.sh b/tests/integration/targets/cics_cmci_missing_requests_library/runme.sh
@@ -3,6 +3,8 @@
 # Apache License, Version 2.0 (see https://opensource.org/licenses/Apache-2.0)
 set -eux # This is important to ensure that return codes from failing tests are propagated
 
+export ANSIBLE_INVENTORY="$ANSIBLE_COLLECTIONS_PATH/ansible_collections/ibm/ibm_zos_cics/tests/integration/inventory_zos.yml"
+
 if pip show requests 2>&1 | grep -q 'Package(s) not found'; then 
     ansible-playbook playbooks/cmci_missing_requests.yml
 else
diff --git a/tests/integration/targets/cics_cmci_missing_xmltodict_library/runme.sh b/tests/integration/targets/cics_cmci_missing_xmltodict_library/runme.sh
@@ -3,6 +3,8 @@
 # Apache License, Version 2.0 (see https://opensource.org/licenses/Apache-2.0)
 set -eux # This is important to ensure that return codes from failing tests are propagated
 
+export ANSIBLE_INVENTORY="$ANSIBLE_COLLECTIONS_PATH/ansible_collections/ibm/ibm_zos_cics/tests/integration/inventory_zos.yml"
+
 if pip show xmltodict 2>&1 | grep -q 'Package(s) not found'; then 
     ansible-playbook playbooks/cmci_missing_xmltodict.yml
 else
diff --git a/tests/integration/targets/cics_csd/runme.sh b/tests/integration/targets/cics_csd/runme.sh
@@ -4,8 +4,6 @@
 
 set -eux
 
-VAR_PATH="$ANSIBLE_COLLECTIONS_PATH/ansible_collections/ibm/ibm_zos_cics/tests/integration/variables/provisioning.yml"
-INV_PATH="$ANSIBLE_COLLECTIONS_PATH/ansible_collections/ibm/ibm_zos_cics/tests/integration/inventory_zos.yml"
-ZOS_ENV="$ANSIBLE_COLLECTIONS_PATH/ansible_collections/ibm/ibm_zos_cics/tests/integration/variables/zos.yml"
+export ANSIBLE_INVENTORY="$ANSIBLE_COLLECTIONS_PATH/ansible_collections/ibm/ibm_zos_cics/tests/integration/inventory_zos.yml"
 
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" playbooks/csdup_script.yml
+ansible-playbook playbooks/csdup_script.yml
diff --git a/tests/integration/targets/cics_data_set/runme.sh b/tests/integration/targets/cics_data_set/runme.sh
@@ -4,9 +4,7 @@
 
 set -eux
 
-VAR_PATH="$ANSIBLE_COLLECTIONS_PATH/ansible_collections/ibm/ibm_zos_cics/tests/integration/variables/provisioning.yml"
-INV_PATH="$ANSIBLE_COLLECTIONS_PATH/ansible_collections/ibm/ibm_zos_cics/tests/integration/inventory_zos.yml"
-ZOS_ENV="$ANSIBLE_COLLECTIONS_PATH/ansible_collections/ibm/ibm_zos_cics/tests/integration/variables/zos.yml"
+export ANSIBLE_INVENTORY="$ANSIBLE_COLLECTIONS_PATH/ansible_collections/ibm/ibm_zos_cics/tests/integration/inventory_zos.yml"
 
 # These tests use a base "template" test that is run for each data set in turn, with parameters passed in
 # to tailor the test. Where possible, parameters are passed in on the ansible-playbook command, but there
@@ -55,41 +53,41 @@ sed -e "s/MODULE_NAME/transaction_dump/g"    -e "s/DATA_SET_NAME_LOWER/dfhdmpa/g
 # For debug, uncomment this to save the generated playbooks to the output directory if you want to see the effect of the sed commands
 # cp -r playbooks $ANSIBLE_COLLECTIONS_PATH/ansible_collections/ibm/ibm_zos_cics/tests/output/templates
 
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHTEMP, vsam: true}"                playbooks/initial_absent_aux_temp_storage.yml
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHCSD, vsam: true, recreate: true}" playbooks/initial_absent_csd.yml
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHGCD, vsam: true, start: true}"    playbooks/initial_absent_global_catalog.yml
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHINTRA, vsam: true}"               playbooks/initial_absent_td_intrapartition.yml
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHLCD, vsam: true, recreate: true}" playbooks/initial_absent_local_catalog.yml
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHLRQ, vsam: true}"                 playbooks/initial_absent_local_request_queue.yml
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHAUXT}"                            playbooks/initial_absent_aux_trace.yml
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHDMPA}"                            playbooks/initial_absent_transaction_dump.yml
+ansible-playbook -e "{data_set_name: DFHTEMP, vsam: true}"                playbooks/initial_absent_aux_temp_storage.yml
+ansible-playbook -e "{data_set_name: DFHCSD, vsam: true, recreate: true}" playbooks/initial_absent_csd.yml
+ansible-playbook -e "{data_set_name: DFHGCD, vsam: true, start: true}"    playbooks/initial_absent_global_catalog.yml
+ansible-playbook -e "{data_set_name: DFHINTRA, vsam: true}"               playbooks/initial_absent_td_intrapartition.yml
+ansible-playbook -e "{data_set_name: DFHLCD, vsam: true, recreate: true}" playbooks/initial_absent_local_catalog.yml
+ansible-playbook -e "{data_set_name: DFHLRQ, vsam: true}"                 playbooks/initial_absent_local_request_queue.yml
+ansible-playbook -e "{data_set_name: DFHAUXT}"                            playbooks/initial_absent_aux_trace.yml
+ansible-playbook -e "{data_set_name: DFHDMPA}"                            playbooks/initial_absent_transaction_dump.yml
 
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHTEMP}"  playbooks/validation_aux_temp_storage.yml
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHCSD}"   playbooks/validation_csd.yml
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHGCD}"   playbooks/validation_global_catalog.yml
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHINTRA}" playbooks/validation_td_intrapartition.yml
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHLCD}"   playbooks/validation_local_catalog.yml
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHLRQ}"   playbooks/validation_local_request_queue.yml
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHAUXT}"  playbooks/validation_aux_trace.yml
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHDMPA}"  playbooks/validation_transaction_dump.yml
+ansible-playbook -e "{data_set_name: DFHTEMP}"  playbooks/validation_aux_temp_storage.yml
+ansible-playbook -e "{data_set_name: DFHCSD}"   playbooks/validation_csd.yml
+ansible-playbook -e "{data_set_name: DFHGCD}"   playbooks/validation_global_catalog.yml
+ansible-playbook -e "{data_set_name: DFHINTRA}" playbooks/validation_td_intrapartition.yml
+ansible-playbook -e "{data_set_name: DFHLCD}"   playbooks/validation_local_catalog.yml
+ansible-playbook -e "{data_set_name: DFHLRQ}"   playbooks/validation_local_request_queue.yml
+ansible-playbook -e "{data_set_name: DFHAUXT}"  playbooks/validation_aux_trace.yml
+ansible-playbook -e "{data_set_name: DFHDMPA}"  playbooks/validation_transaction_dump.yml
 
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name_A: DFHAUXT, data_set_name_B: DFHBUXT}" playbooks/destination_aux_trace.yml
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name_A: DFHDMPA, data_set_name_B: DFHDMPB}" playbooks/destination_transaction_dump.yml
+ansible-playbook -e "{data_set_name_A: DFHAUXT, data_set_name_B: DFHBUXT}" playbooks/destination_aux_trace.yml
+ansible-playbook -e "{data_set_name_A: DFHDMPA, data_set_name_B: DFHDMPB}" playbooks/destination_transaction_dump.yml
 
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHTEMP}"  playbooks/region_group_aux_temp_storage.yml
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHCSD}"   playbooks/region_group_csd.yml
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHGCD}"   playbooks/region_group_global_catalog.yml
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHINTRA}" playbooks/region_group_td_intrapartition.yml
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHLCD}"   playbooks/region_group_local_catalog.yml
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHLRQ}"   playbooks/region_group_local_request_queue.yml
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHAUXT}"  playbooks/region_group_aux_trace.yml
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHDMPA}"  playbooks/region_group_transaction_dump.yml
+ansible-playbook -e "{data_set_name: DFHTEMP}"  playbooks/region_group_aux_temp_storage.yml
+ansible-playbook -e "{data_set_name: DFHCSD}"   playbooks/region_group_csd.yml
+ansible-playbook -e "{data_set_name: DFHGCD}"   playbooks/region_group_global_catalog.yml
+ansible-playbook -e "{data_set_name: DFHINTRA}" playbooks/region_group_td_intrapartition.yml
+ansible-playbook -e "{data_set_name: DFHLCD}"   playbooks/region_group_local_catalog.yml
+ansible-playbook -e "{data_set_name: DFHLRQ}"   playbooks/region_group_local_request_queue.yml
+ansible-playbook -e "{data_set_name: DFHAUXT}"  playbooks/region_group_aux_trace.yml
+ansible-playbook -e "{data_set_name: DFHDMPA}"  playbooks/region_group_transaction_dump.yml
 
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHTEMP}"  playbooks/template_override_aux_temp_storage.yml
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHCSD}"   playbooks/template_override_csd.yml
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHGCD}"   playbooks/template_override_global_catalog.yml
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHINTRA}" playbooks/template_override_td_intrapartition.yml
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHLCD}"   playbooks/template_override_local_catalog.yml
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHLRQ}"   playbooks/template_override_local_request_queue.yml
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHAUXT}"  playbooks/template_override_aux_trace.yml
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" -e "{data_set_name: DFHDMPA}"  playbooks/template_override_transaction_dump.yml
+ansible-playbook -e "{data_set_name: DFHTEMP}"  playbooks/template_override_aux_temp_storage.yml
+ansible-playbook -e "{data_set_name: DFHCSD}"   playbooks/template_override_csd.yml
+ansible-playbook -e "{data_set_name: DFHGCD}"   playbooks/template_override_global_catalog.yml
+ansible-playbook -e "{data_set_name: DFHINTRA}" playbooks/template_override_td_intrapartition.yml
+ansible-playbook -e "{data_set_name: DFHLCD}"   playbooks/template_override_local_catalog.yml
+ansible-playbook -e "{data_set_name: DFHLRQ}"   playbooks/template_override_local_request_queue.yml
+ansible-playbook -e "{data_set_name: DFHAUXT}"  playbooks/template_override_aux_trace.yml
+ansible-playbook -e "{data_set_name: DFHDMPA}"  playbooks/template_override_transaction_dump.yml
diff --git a/tests/integration/targets/cics_missing_zos_core/runme.sh b/tests/integration/targets/cics_missing_zos_core/runme.sh
diff --git a/tests/integration/targets/cics_region_jcl/runme.sh b/tests/integration/targets/cics_region_jcl/runme.sh
diff --git a/tests/integration/targets/cics_start_stop/runme.sh b/tests/integration/targets/cics_start_stop/runme.sh
diff --git a/tests/integration/targets/cics_templating/runme.sh b/tests/integration/targets/cics_templating/runme.sh
diff --git a/tests/integration/targets/cics_utilities/playbooks/failure.yml b/tests/integration/targets/cics_utilities/playbooks/failure.yml
diff --git a/tests/integration/targets/cics_utilities/runme.sh b/tests/integration/targets/cics_utilities/runme.sh
diff --git a/tests/integration/template.inventory_zos.yml b/tests/integration/template.inventory_zos.yml
diff --git a/tests/integration/variables/template.cmci.yml b/tests/integration/variables/template.cmci.yml
diff --git a/tests/integration/variables/template.provisioning.yml b/tests/integration/variables/template.provisioning.yml
diff --git a/tests/integration/variables/template.zos.yml b/tests/integration/variables/template.zos.yml
