Adding upstream version 9.4.0+dfsg.upstream/9.4.0+dfsg

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

1 files changed, 66 insertions, 57 deletions

diff --git a/ansible_collections/community/docker/.azure-pipelines/azure-pipelines.yml b/ansible_collections/community/docker/.azure-pipelines/azure-pipelines.yml
index ac5c8623d..b54ccc148 100644
--- a/ansible_collections/community/docker/.azure-pipelines/azure-pipelines.yml
+++ b/ansible_collections/community/docker/.azure-pipelines/azure-pipelines.yml
@@ -46,7 +46,7 @@ variables:
 resources:
   containers:
     - container: default
-      image: quay.io/ansible/azure-pipelines-test-container:3.0.0
+      image: quay.io/ansible/azure-pipelines-test-container:4.0.1
 
 pool: Standard
 
@@ -66,6 +66,17 @@ stages:
               test: 'devel/sanity/extra'
             - name: Units
               test: 'devel/units/1'
+  - stage: Ansible_2_16
+    displayName: Sanity & Units 2.16
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          targets:
+            - name: Sanity
+              test: '2.16/sanity/1'
+            - name: Units
+              test: '2.16/units/1'
   - stage: Ansible_2_15
     displayName: Sanity & Units 2.15
     dependsOn: []
@@ -88,17 +99,6 @@ stages:
               test: '2.14/sanity/1'
             - name: Units
               test: '2.14/units/1'
-  - stage: Ansible_2_13
-    displayName: Sanity & Units 2.13
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          targets:
-            - name: Sanity
-              test: '2.13/sanity/1'
-            - name: Units
-              test: '2.13/units/1'
 
 ### Docker
   - stage: Docker_devel
@@ -109,12 +109,8 @@ stages:
         parameters:
           testFormat: devel/linux/{0}
           targets:
-            - name: CentOS 7
-              test: centos7
-            - name: Fedora 37
-              test: fedora37
-            - name: openSUSE 15
-              test: opensuse15
+            - name: Fedora 39
+              test: fedora39
             - name: Ubuntu 20.04
               test: ubuntu2004
             - name: Ubuntu 22.04
@@ -124,49 +120,55 @@ stages:
           groups:
             - 4
             - 5
-  - stage: Docker_2_15
-    displayName: Docker 2.15
+            - 6
+  - stage: Docker_2_16
+    displayName: Docker 2.16
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.15/linux/{0}
+          testFormat: 2.16/linux/{0}
           targets:
+            - name: Fedora 38
+              test: fedora38
             - name: CentOS 7
               test: centos7
+            - name: openSUSE 15
+              test: opensuse15
           groups:
             - 4
             - 5
-  - stage: Docker_2_14
-    displayName: Docker 2.14
+            - 6
+  - stage: Docker_2_15
+    displayName: Docker 2.15
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.14/linux/{0}
+          testFormat: 2.15/linux/{0}
           targets:
-            - name: Fedora 36
-              test: fedora36
+            - name: Fedora 37
+              test: fedora37
+            - name: CentOS 7
+              test: centos7
           groups:
             - 4
             - 5
-  - stage: Docker_2_13
-    displayName: Docker 2.13
+            - 6
+  - stage: Docker_2_14
+    displayName: Docker 2.14
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.13/linux/{0}
+          testFormat: 2.14/linux/{0}
           targets:
-            - name: Fedora 35
-              test: fedora35
-            - name: openSUSE 15 py2
-              test: opensuse15py2
             - name: Alpine 3
               test: alpine3
           groups:
             - 4
             - 5
+            - 6
 
 ### Community Docker
   - stage: Docker_community_devel
@@ -179,15 +181,14 @@ stages:
           targets:
             - name: Debian Bullseye
               test: debian-bullseye/3.9
+            - name: Debian Bookworm
+              test: debian-bookworm/3.11
             - name: ArchLinux
               test: archlinux/3.11
-            - name: CentOS Stream 8 with Python 3.6
-              test: centos-stream8/3.6
-            - name: CentOS Stream 8 with Python 3.9
-              test: centos-stream8/3.9
           groups:
             - 4
             - 5
+            - 6
 
 ### Remote
   - stage: Remote_devel
@@ -198,56 +199,64 @@ stages:
         parameters:
           testFormat: devel/{0}
           targets:
-            - name: RHEL 9.1 with latest Docker SDK from PyPi
-              test: rhel/9.1-pypi-latest
+            - name: RHEL 9.3 with latest Docker SDK from PyPi
+              test: rhel/9.3-pypi-latest
+            # Currently always hangs in group 2
+            # - name: RHEL 8.8
+            #   test: rhel/8.8
           groups:
             - 1
             - 2
             - 3
             - 4
             - 5
-  - stage: Remote_2_15
-    displayName: Remote 2.15
+            - 6
+  - stage: Remote_2_16
+    displayName: Remote 2.16
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.15/{0}
+          testFormat: 2.16/{0}
           targets:
-            - name: RHEL 7.9
-              test: rhel/7.9
+            - name: RHEL 9.2
+              test: rhel/9.2
           groups:
             - 1
             - 2
             - 3
             - 4
             - 5
-  - stage: Remote_2_14
-    displayName: Remote 2.14
+  - stage: Remote_2_15
+    displayName: Remote 2.15
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.14/{0}
+          testFormat: 2.15/{0}
           targets:
-            - name: RHEL 9.0
-              test: rhel/9.0
+            - name: RHEL 9.1
+              test: rhel/9.1
+            - name: RHEL 8.7
+              test: rhel/8.7
+            - name: RHEL 7.9
+              test: rhel/7.9
           groups:
             - 1
             - 2
             - 3
             - 4
             - 5
-  - stage: Remote_2_13
-    displayName: Remote 2.13
+  - stage: Remote_2_14
+    displayName: Remote 2.14
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.13/{0}
+          testFormat: 2.14/{0}
           targets:
-            - name: RHEL 8.5
-              test: rhel/8.5
+            - name: RHEL 9.0
+              test: rhel/9.0
           groups:
             - 1
             - 2
@@ -261,17 +270,17 @@ stages:
     condition: succeededOrFailed()
     dependsOn:
       - Ansible_devel
+      - Ansible_2_16
       - Ansible_2_15
       - Ansible_2_14
-      - Ansible_2_13
       - Remote_devel
+      - Remote_2_16
       - Remote_2_15
       - Remote_2_14
-      - Remote_2_13
       - Docker_devel
+      - Docker_2_16
       - Docker_2_15
       - Docker_2_14
-      - Docker_2_13
       - Docker_community_devel
     jobs:
       - template: templates/coverage.yml