Adding upstream version 9.5.1+dfsg.upstream/9.5.1+dfsg

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

1 files changed, 41 insertions, 198 deletions

diff --git a/ansible_collections/community/rabbitmq/.azure-pipelines/azure-pipelines.yml b/ansible_collections/community/rabbitmq/.azure-pipelines/azure-pipelines.yml
index 7002adffa..69638bf11 100644
--- a/ansible_collections/community/rabbitmq/.azure-pipelines/azure-pipelines.yml
+++ b/ansible_collections/community/rabbitmq/.azure-pipelines/azure-pipelines.yml
@@ -36,7 +36,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
 
@@ -54,77 +54,41 @@ stages:
             - name: Units
               test: 'devel/units/1'
 
-  - stage: Ansible_2_14
-    displayName: Sanity & Units 2.14
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          targets:
-            - name: Sanity
-              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'
-
-  - stage: Ansible_2_12
-    displayName: Sanity & Units 2.12
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          targets:
-            - name: Sanity
-              test: '2.12/sanity/1'
-            - name: Units
-              test: '2.12/units/1'
-
-  - stage: Ansible_2_11
-    displayName: Sanity & Units 2.11
+  - stage: Ansible_2_16
+    displayName: Sanity & Units 2.16
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           targets:
             - name: Sanity
-              test: '2.11/sanity/1'
+              test: '2.16/sanity/1'
             - name: Units
-              test: '2.11/units/1'
+              test: '2.16/units/1'
 
-  - stage: Ansible_2_10
-    displayName: Sanity & Units 2.10
+  - stage: Ansible_2_15
+    displayName: Sanity & Units 2.15
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           targets:
             - name: Sanity
-              test: '2.10/sanity/1'
+              test: '2.15/sanity/1'
             - name: Units
-              test: '2.10/units/1'
+              test: '2.15/units/1'
 
-  - stage: Ansible_2_9
-    displayName: Sanity & Units 2.9
+  - stage: Ansible_2_14
+    displayName: Sanity & Units 2.14
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           targets:
             - name: Sanity
-              test: '2.9/sanity/1'
+              test: '2.14/sanity/1'
             - name: Units
-              test: '2.9/units/1'
+              test: '2.14/units/1'
 
 ### Docker
   - stage: Docker_devel
@@ -163,113 +127,50 @@ stages:
             #- name: Ubuntu 20.04
             #  test: ubuntu2004
 
-  - stage: Docker_2_14
-    displayName: Docker 2.14
+  - stage: Docker_2_16
+    displayName: Docker 2.16
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.14/linux/{0}/1
+          testFormat: 2.16/linux/{0}/1
           targets:
             - name: Ubuntu 22.04
               test: ubuntu2204
-            # Currently 20.04 is causing devel to fail.  This maybe due to Ubuntu 20.04 running python
-            # 3.8, however, ansible-test requires 3.9+.  This means ansible test spins up a controller
-            # and target container which is probably why rabbitmq_publish is not able to connect to
-            # rabbitmq on localhost.
-            #- name: Ubuntu 20.04
-            #  test: ubuntu2004
-
-  - stage: Docker_2_13
-    displayName: Docker 2.13
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.13/linux/{0}/1
-          targets:
-            #- name: Ubuntu 18.04
-            #  test: ubuntu1804
-            - name: Ubuntu 20.04
-              test: ubuntu2004
-
-  - stage: Docker_2_12
-    displayName: Docker 2.12
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.12/linux/{0}/1
-          targets:
-            #- name: Ubuntu 18.04
-            #  test: ubuntu1804
-            - name: Ubuntu 20.04
-              test: ubuntu2004
-
-  - stage: Docker_2_11
-    displayName: Docker 2.11
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.11/linux/{0}/1
-          targets:
-            # NOTE: update integration roles to support platform before enabling here.
-            #- name: CentOS 6
-            #  test: centos6
-            #- name: CentOS 7
-            #  test: centos7
-            #- name: Fedora 32
-            #  test: fedora32
-            #- name: Fedora 33
-            #  test: fedora33
-            #- name: openSUSE 15 py2
-            #  test: opensuse15py2
-            #- name: openSUSE 15 py3
-            #  test: opensuse15
-            - name: Ubuntu 18.04
-              test: ubuntu1804
-            - name: Ubuntu 20.04
-              test: ubuntu2004
 
-  - stage: Docker_2_10
-    displayName: Docker 2.10
+  - stage: Docker_2_15
+    displayName: Docker 2.15
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.10/linux/{0}/1
+          testFormat: 2.15/linux/{0}/1
           targets:
-            # NOTE: update integration roles to support platform before enabling here.
-            #- name: CentOS 6
-            #  test: centos6
-            #- name: CentOS 7
-            #  test: centos7
-            #- name: Fedora 31
-            #  test: fedora31
-            #- name: Fedora 32
-            #  test: fedora32
-            #- name: openSUSE 15 py2
-            #  test: opensuse15py2
-            #- name: openSUSE 15 py3
-            #  test: opensuse15
-            - name: Ubuntu 18.04
-              test: ubuntu1804
-            - name: Ubuntu 20.04
-              test: ubuntu2004
+            - name: Ubuntu 22.04
+              test: ubuntu2204
+            # Currently 20.04 is causing devel to fail.  This maybe due to Ubuntu 20.04 running python
+            # 3.8, however, ansible-test requires 3.9+.  This means ansible test spins up a controller
+            # and target container which is probably why rabbitmq_publish is not able to connect to
+            # rabbitmq on localhost.
+            #- name: Ubuntu 20.04
+            #  test: ubuntu2004
 
-  - stage: Docker_2_9
-    displayName: Docker 2.9
+  - stage: Docker_2_14
+    displayName: Docker 2.14
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.9/linux/{0}/1
+          testFormat: 2.14/linux/{0}/1
           targets:
-            # NOTE: update integration roles to support platform before adding here.
-            - name: Ubuntu 18.04
-              test: ubuntu1804  # freezes in rabbitmq_setup
-            # ansible-test 2.9 does not support 20.04 (image not included in its test-containers list)
+            - name: Ubuntu 22.04
+              test: ubuntu2204
+            # Currently 20.04 is causing devel to fail.  This maybe due to Ubuntu 20.04 running python
+            # 3.8, however, ansible-test requires 3.9+.  This means ansible test spins up a controller
+            # and target container which is probably why rabbitmq_publish is not able to connect to
+            # rabbitmq on localhost.
+            #- name: Ubuntu 20.04
+            #  test: ubuntu2004
 
 ### Remote
 #  - stage: Remote_devel
@@ -288,74 +189,16 @@ stages:
 #              test: freebsd/11.4
 #            - name: FreeBSD 12.2
 #              test: freebsd/12.2
-#  - stage: Remote_2_11
-#    displayName: Remote 2.11
-#    dependsOn: []
-#    jobs:
-#      - template: templates/matrix.yml
-#        parameters:
-#          testFormat: 2.11/{0}/1
-#          targets:
-#            - name: RHEL 7.9
-#              test: rhel/7.9
-#            - name: RHEL 8.3
-#              test: rhel/8.3
-#            - name: FreeBSD 11.4
-#              test: freebsd/11.4
-#            - name: FreeBSD 12.2
-#              test: freebsd/12.2
-#  - stage: Remote_2_10
-#    displayName: Remote 2.10
-#    dependsOn: []
-#    jobs:
-#      - template: templates/matrix.yml
-#        parameters:
-#          testFormat: 2.10/{0}/1
-#          targets:
-#            - name: RHEL 7.8
-#              test: rhel/7.8
-#            - name: RHEL 8.2
-#              test: rhel/8.2
-#            - name: FreeBSD 11.1
-#              test: freebsd/11.1
-#            - name: FreeBSD 12.1
-#              test: freebsd/12.1
-#  - stage: Remote_2_9
-#    displayName: Remote 2.9
-#    dependsOn: []
-#    jobs:
-#      - template: templates/matrix.yml
-#        parameters:
-#          testFormat: 2.9/{0}/1
-#          targets:
-#            - name: RHEL 7.8
-#              test: rhel/7.8
-#            - name: RHEL 8.2
-#              test: rhel/8.2
-#            - name: FreeBSD 11.1
-#              test: freebsd/11.1
-#            - name: FreeBSD 12.1
-#              test: freebsd/12.1
+
   - stage: Summary
     condition: succeededOrFailed()
     dependsOn:
       - Ansible_devel
+      - Ansible_2_15
       - Ansible_2_14
-      - Ansible_2_13
-      - Ansible_2_12
-      - Ansible_2_11
-      - Ansible_2_10
-      - Ansible_2_9
       - Docker_devel
+      - Docker_2_15
       - Docker_2_14
-      - Docker_2_13
-      - Docker_2_12
-      - Docker_2_11
-      - Docker_2_10
-      - Docker_2_9
       #- Remote_devel
-      #- Remote_2_11
-      #- Remote_2_10
-      #- Remote_2_9
     jobs:
       - template: templates/coverage.yml