Merge pull request ansible-collections#147 from CICS/integration-fixes

Refactored integration tests so they can be run all together

Author: ledina

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/targets/cics_intra_missing_zos_core/playbooks/missing_core.yml renamed to tests/integration/targets/cics_missing_zos_core/playbooks/missing_core.yml

@@ -8,4 +8,7 @@ VAR_PATH="$ANSIBLE_COLLECTIONS_PATH/ansible_collections/ibm/ibm_zos_cics/tests/i
 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"
 
-ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" playbooks/missing_core.yml
+
+if [ -z "$(ansible-galaxy collection list ibm.ibm_zos_core)" ]; then
+ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" playbooks/missing_core.yml
+fi

tests/integration/targets/cics_intra_missing_zos_core/runme.sh renamed to tests/integration/targets/cics_missing_zos_core/runme.sh

@@ -8,4 +8,8 @@ VAR_PATH="$ANSIBLE_COLLECTIONS_PATH/ansible_collections/ibm/ibm_zos_cics/tests/i
 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"
 
+python_ver=$(python -V 2>&1 | grep -Po '(?<=Python )(.+)')
+
+if [[ "${python_ver:0:3}" != "2.7" ]]; then
 ansible-playbook -i "$INV_PATH" -e "@$VAR_PATH" -e "@$ZOS_ENV" playbooks/aux_trace_warm_state.yml
+fi