sanity testing corrections

Signed-off-by: Andrew Twydell <[email protected]>

Author: AndrewTwydell

.ansible-lint

@@ -0,0 +1,3 @@
+---
+skip_list:
+    - "name[template]"

.gitignore

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

common.Dockerfile

@@ -1,17 +1,18 @@
-ARG PYTHON_VERSION
+ARG PYTHON_VERSION_SET
 
-FROM python:${PYTHON_VERSION}
-
-USER root
+FROM python:${PYTHON_VERSION_SET}
 
 SHELL [ "/bin/bash", "-c" ]
 
 RUN apt-get update && apt upgrade -y
 
-COPY ./requirements.txt /ibm_zos_cics/ansible_collections/ibm/ibm_zos_cics/
-COPY ./dev-requirements.txt /ibm_zos_cics/ansible_collections/ibm/ibm_zos_cics/
+COPY ./requirements.txt /root/ibm_zos_cics/ansible_collections/ibm/ibm_zos_cics/requirements.txt
+COPY ./dev-requirements.txt /root/ibm_zos_cics/ansible_collections/ibm/ibm_zos_cics/dev-requirements.txt
+
+RUN pip install -r /root/ibm_zos_cics/ansible_collections/ibm/ibm_zos_cics/dev-requirements.txt
 
-RUN pip install -r /ibm_zos_cics/ansible_collections/ibm/ibm_zos_cics/dev-requirements.txt
+ENV OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
+ARG PYTHON_VERSION_SET
+ENV PYTHON_VERSION_SET=${PYTHON_VERSION_SET}
 
-COPY ./ /ibm_zos_cics/ansible_collections/ibm/ibm_zos_cics
-WORKDIR /ibm_zos_cics/ansible_collections/ibm/ibm_zos_cics
+WORKDIR /root/ibm_zos_cics/ansible_collections/ibm/ibm_zos_cics

dev-requirements.txt

@@ -9,13 +9,13 @@ mock==3.0.5
 requests_mock==1.8.0
 pytest-xdist==1.34.0 # Need this to work around a problem running ansible-test
 pytest==4.6.11; python_version < '3'
-pytest==6.2.1; python_version >= '3'
+pytest==7.2.0; python_version >= '3'
 # Non-test requirements (python 3+ only)
 pylint==2.5.3; python_version >= '3'
-shellcheck-py==0.7.1.1; python_version >= '3'
+shellcheck-py==0.9.0.2; python_version >= '3'
 rstcheck==3.3.1; python_version >= '3'
-yamllint==1.28.0; python_version >= '3'
-voluptuous==0.12.1; python_version >= '3'
+yamllint==1.29.0; python_version >= '3'
+voluptuous==0.13.1; python_version >= '3'
 ansible-doc-extractor==0.1.6; python_version >= '3'
 ansible-lint==6.10.2; python_version >= '3'
 pycodestyle==2.6.0; python_version >= '3'

docker-compose.yaml

@@ -7,11 +7,47 @@ services:
       context: .
       dockerfile: common.Dockerfile
       args:
-        PYTHON_VERSION: 2.7.18
+        PYTHON_VERSION_SET: 2.7
+    entrypoint: /bin/bash -c "/root/ibm_zos_cics/ansible_collections/ibm/ibm_zos_cics/container.build.sh"
+    volumes:
+      - ./:/root/ibm_zos_cics/ansible_collections/ibm/ibm_zos_cics
 
   python38:
     build:
       context: .
       dockerfile: common.Dockerfile
       args:
-        PYTHON_VERSION: 3.8
+        PYTHON_VERSION_SET: 3.8
+    entrypoint: /bin/bash -c "/root/ibm_zos_cics/ansible_collections/ibm/ibm_zos_cics/container.build.sh"
+    volumes:
+      - ./:/root/ibm_zos_cics/ansible_collections/ibm/ibm_zos_cics
+
+  python39:
+    build:
+      context: .
+      dockerfile: common.Dockerfile
+      args:
+        PYTHON_VERSION_SET: "3.9"
+    entrypoint: /bin/bash -c "/root/ibm_zos_cics/ansible_collections/ibm/ibm_zos_cics/container.build.sh"
+    volumes:
+      - ./:/root/ibm_zos_cics/ansible_collections/ibm/ibm_zos_cics
+
+  python310:
+    build:
+      context: .
+      dockerfile: common.Dockerfile
+      args:
+        PYTHON_VERSION_SET: "3.10"
+    entrypoint: /bin/bash -c "/root/ibm_zos_cics/ansible_collections/ibm/ibm_zos_cics/container.build.sh"
+    volumes:
+      - ./:/root/ibm_zos_cics/ansible_collections/ibm/ibm_zos_cics
+
+  python311:
+    build:
+      context: .
+      dockerfile: common.Dockerfile
+      args:
+        PYTHON_VERSION_SET: "3.11"
+    entrypoint: /bin/bash -c "/root/ibm_zos_cics/ansible_collections/ibm/ibm_zos_cics/container.build.sh"
+    volumes:
+      - ./:/root/ibm_zos_cics/ansible_collections/ibm/ibm_zos_cics

plugins/doc_fragments/cmci.py

@@ -145,7 +145,7 @@ class ModuleDocFragment(object):
             C(and) and C(or) operators, see the C(complex_filter) parameter.
           - For more details, see
             L(How to build a filter expression,https://www.ibm.com/docs/en/cics-ts/latest?topic=expressions-how-build-filter-expression).
-          - For examples, see M(cmci_get).
+          - For examples, see M(ibm.ibm_zos_cics.cmci_get).
           - For supported attributes of different resource types, see their
             resource table reference, for example,
             L(PROGDEF resource table reference,https://www.ibm.com/docs/en/cics-ts/latest?topic=tables-progdef-resource-table).
@@ -167,7 +167,7 @@ class ModuleDocFragment(object):
           - When supplying the C(attribute) option, you must also supply a
             C(value) for the filter. You can also override the default
             operator of C(=) with the C(operator) option.
-          - For examples, see "Examples" in M(cmci_get).
+          - For examples, see "Examples" in M(ibm.ibm_zos_cics.cmci_get).
         type: dict
         required: false
         suboptions: