Copy build changes from feature/catalog

Author: andrewhughes101

.gitignore

@@ -7,5 +7,5 @@ venv*
 .venv
 tests/output
 ibm-ibm_zos_cics-*.tar.gz
-tests/integration/targets/cics_cmci/cmci-variables.yml
 tests/integration/inventory
+tests/integration/variables/cmci.yml

tests/integration/targets/cics_cmci/runme.sh

@@ -2,18 +2,21 @@
 # (c) Copyright IBM Corp. 2020,2021
 # 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
-ansible-playbook -e "@cmci-variables.yml" playbooks/cics_cmci_https.yml
-ansible-playbook -e "@cmci-variables.yml" playbooks/cmci_insecure_false.yml
-ansible-playbook -e "@cmci-variables.yml" playbooks/cmci_incorrect_port.yml
-ansible-playbook -e "@cmci-variables.yml" playbooks/cmci_incorrect_host.yml
-ansible-playbook -e "@cmci-variables.yml" playbooks/cmci_invalid_credentials.yml
-ansible-playbook -e "@cmci-variables.yml" playbooks/cmci_incorrect_scope.yml
-ansible-playbook -e "@cmci-variables.yml" playbooks/cmci_incorrect_context.yml
-ansible-playbook -e "@cmci-variables.yml" playbooks/cics_cmci_http.yml
-ansible-playbook -e "@cmci-variables.yml" playbooks/cmci_install_bundle_failure.yml
-ansible-playbook -e "@cmci-variables.yml" playbooks/cmci_create_pipeline_failure.yml
-ansible-playbook -e "@cmci-variables.yml" playbooks/cmci_incorrect_scheme.yml
-ansible-playbook -e "@cmci-variables.yml" playbooks/cmci_bas_link.yml
-ansible-playbook -e "@cmci-variables.yml" playbooks/cmci_bas_install.yml
-ansible-playbook -e "@cmci-variables.yml" playbooks/cmci_bas_install_error.yml
-ansible-playbook -e "@cmci-variables.yml" playbooks/cics_cmci_module_defaults.yml
+
+VAR_PATH="$ANSIBLE_COLLECTIONS_PATH/ansible_collections/ibm/ibm_zos_cics/tests/integration/variables/cmci.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.yml

tests/integration/targets/cics_cmci_missing_requests_library/runme.sh

@@ -2,4 +2,6 @@
 # (c) Copyright IBM Corp. 2021
 # 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
+if pip show requests 2>&1 | grep -q 'Package(s) not found'; then 
 ansible-playbook playbooks/cmci_missing_requests.yml
+fi

tests/integration/targets/cics_cmci_missing_xmltodict_library/runme.sh

@@ -2,4 +2,6 @@
 # (c) Copyright IBM Corp. 2021
 # 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
+if pip show xmltodict 2>&1 | grep -q 'Package(s) not found'; then 
 ansible-playbook playbooks/cmci_missing_xmltodict.yml
+fi

tests/integration/variables/template.cmci.yml

@@ -0,0 +1,12 @@
+cmci_host:
+cmci_port:
+cmci_secure_port:
+cmci_user:
+cmci_password:
+cmci_context:
+cmci_scope:
+cmci_scope_region_1:
+cmci_scope_region_2:
+cmci_program_name_1:
+cmci_program_name_2:
+cmci_program_filter: