Merging upstream version 9.4.0+dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 57 insertions, 30 deletions

diff --git a/ansible_collections/cyberark/conjur/.github/workflows/ansible-test.yml b/ansible_collections/cyberark/conjur/.github/workflows/ansible-test.yml
index 27d352352..aa74f4dea 100644
--- a/ansible_collections/cyberark/conjur/.github/workflows/ansible-test.yml
+++ b/ansible_collections/cyberark/conjur/.github/workflows/ansible-test.yml
@@ -1,15 +1,16 @@
 # This file implements a Github action to run Ansible collection sanity tests
-# on the Conjur Ansible Collection. The Ansible collection sanity tests are
-# run across the following matrices:
+# and unit tests on the Conjur Ansible Collection. The Ansible collection tests
+# are run across the following matrices:
 #
-#Ansible versions:
-#    - stable-2.10
-#    - stable-2.11
-#    - stable-2.12
-#    - devel
+# Ansible versions (Python versions):
+# - stable-2.13 (3.8, 3.9, 3.10)
+# - stable-2.14 (3.9, 3.10, 3.11)
+# - stable-2.15 (3.9, 3.10, 3.11)
+# - devel       (3.10)
 #
-#Python versions:
-#    - Python 3.9
+# As Ansible's devel version is unstable, it should be considered a smoke signal
+# for the next released version. Failures against the devel version should not
+# be considered blocking.
 
 name: CI
 on:
@@ -20,23 +21,35 @@ on:
 jobs:
 
 ###
-# Sanity tests (REQUIRED)
+# Sanity tests
 #
 # https://docs.ansible.com/ansible/latest/dev_guide/testing_sanity.html
 
   sanity:
-    name: Sanity (${{ matrix.ansible }}+py${{ matrix.python }})
+    name: Sanity (Ⓐ${{ matrix.ansible }}+py${{ matrix.python }})
     strategy:
+      # fail-fast means one failing matrix case will cancel all other
+      # still-incomplete cases. As tests against Ansible's devel branch are
+      # unstable, this is disabled.
+      fail-fast: false
       matrix:
         ansible:
-          # It's important that Sanity is tested against all stable-X.Y branches
-          # Testing against `devel` may fail as new tests are added.
-          - stable-2.10
-          - stable-2.11
-          - stable-2.12
-          - devel
+          - stable-2.13
+          - stable-2.14
+          - stable-2.15
         python:
-          - 3.9
+          - '3.9'
+          - '3.10'
+        include:
+          - ansible: stable-2.13
+            python: '3.8'
+          - ansible: stable-2.14
+            python: '3.11'
+          - ansible: stable-2.15
+            python: '3.11'
+          - ansible: devel
+            python: '3.10'
+
     runs-on: ubuntu-latest
     steps:
 
@@ -44,45 +57,59 @@ jobs:
       # .../ansible_collections/cyberark/conjur/
 
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: ansible_collections/cyberark/conjur
 
       - name: Set up Python ${{ matrix.ansible }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
 
-      # Install the head of the given branch (devel, stable-2.10)
+      # Install the head of the given branch
       - name: Install ansible-base (${{ matrix.ansible }})
         run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check
 
       # run ansible-test sanity inside of Docker.
       # The docker container has all the pinned dependencies that are required.
-      # Explicity specify the version of Python we want to test
+      # Explicitly specify the version of Python we want to test
       - name: Run sanity tests
         run: ansible-test sanity --docker -v --color --python ${{ matrix.python }}
         working-directory: ./ansible_collections/cyberark/conjur
 
-# Unit tests (OPTIONAL)
-
+###
+# Unit tests
+#
 # https://docs.ansible.com/ansible/latest/dev_guide/testing_units.html
 
   units:
     name: Units (Ⓐ${{ matrix.ansible }}+py${{ matrix.python }})
     strategy:
+      # fail-fast means one failing matrix case will cancel all other
+      # still-incomplete cases. As tests against Ansible's devel branch are
+      # unstable, this is disabled.
+      fail-fast: false
       matrix:
         ansible:
-          - stable-2.10
-          - stable-2.11
-          - stable-2.12
-          - devel
+          - stable-2.13
+          - stable-2.14
+          - stable-2.15
         python:
-          - 3.9
+          - '3.9'
+          - '3.10'
+        include:
+          - ansible: stable-2.13
+            python: '3.8'
+          - ansible: stable-2.14
+            python: '3.11'
+          - ansible: stable-2.15
+            python: '3.11'
+          - ansible: devel
+            python: '3.10'
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: ansible_collections/cyberark/conjur