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

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

3 files changed, 69 insertions, 87 deletions

diff --git a/ansible_collections/community/postgresql/.azure-pipelines/azure-pipelines.yml b/ansible_collections/community/postgresql/.azure-pipelines/azure-pipelines.yml
index 4a34c9edf..28f8b2497 100644
--- a/ansible_collections/community/postgresql/.azure-pipelines/azure-pipelines.yml
+++ b/ansible_collections/community/postgresql/.azure-pipelines/azure-pipelines.yml
@@ -36,11 +36,30 @@ 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
 
 stages:
+  - stage: Python_qualtiy_tools
+    displayName: Python quality
+    dependsOn: []
+    jobs:
+      - job: 'Test'
+        pool:
+          vmImage: 'ubuntu-latest'
+        steps:
+          - task: UsePythonVersion@0
+            displayName: Get Python for Python tools.
+            inputs:
+              versionSpec: '3.11'
+              addToPath: false
+            name: pyTools
+          - script: $(pyTools.pythonLocation)/bin/pip install --upgrade tox
+            displayName: Upgrade/Install tox.
+          - script: $(pyTools.pythonLocation)/bin/tox -e lint
+            displayName: Run tox -e lint
+
 ## Sanity & units
   - stage: Ansible_devel
     displayName: Sanity & Units devel
@@ -56,69 +75,74 @@ stages:
             - name: Units
               test: 'devel/units/1'
 
-  - stage: Ansible_2_15
-    displayName: Sanity & Units 2.15
+  - stage: Ansible_2_16
+    displayName: Sanity & Units 2.16
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           targets:
             - name: Sanity
-              test: '2.15/sanity/1'
+              test: '2.16/sanity/1'
             - name: Units
-              test: '2.15/units/1'
+              test: '2.16/units/1'
 
-  - stage: Ansible_2_14
-    displayName: Sanity & Units 2.14
+  - stage: Ansible_2_15
+    displayName: Sanity & Units 2.15
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           targets:
             - name: Sanity
-              test: '2.14/sanity/1'
+              test: '2.15/sanity/1'
             - name: Units
-              test: '2.14/units/1'
+              test: '2.15/units/1'
 
-  - stage: Ansible_2_13
-    displayName: Sanity & Units 2.13
+  - stage: Ansible_2_14
+    displayName: Sanity & Units 2.14
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           targets:
             - name: Sanity
-              test: '2.13/sanity/1'
+              test: '2.14/sanity/1'
             - name: Units
-              test: '2.13/units/1'
+              test: '2.14/units/1'
 
-  - stage: Ansible_2_12
-    displayName: Sanity & Units 2.12
+## Docker
+  - stage: Docker_devel
+    displayName: Docker devel
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
+          testFormat: devel/linux/{0}/1
           targets:
-            - name: Sanity
-              test: '2.12/sanity/1'
-            - name: Units
-              test: '2.12/units/1'
+            - name: Fedora 39
+              test: fedora39
+            - name: Ubuntu 20.04
+              test: ubuntu2004
+            - name: Ubuntu 22.04
+              test: ubuntu2204
 
-## Docker
-  - stage: Docker_devel
-    displayName: Docker devel
+  - stage: Docker_2_16
+    displayName: Docker 2.16
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: devel/linux/{0}/1
+          testFormat: 2.16/linux/{0}/1
           targets:
             - name: CentOS 7
               test: centos7
-            - name: Fedora 37
-              test: fedora37
+            - name: Fedora 38
+              test: fedora38
             - name: Ubuntu 20.04
               test: ubuntu2004
+            - name: Ubuntu 22.04
+              test: ubuntu2204
 
   - stage: Docker_2_15
     displayName: Docker 2.15
@@ -134,6 +158,8 @@ stages:
               test: fedora37
             - name: Ubuntu 20.04
               test: ubuntu2004
+            - name: Ubuntu 22.04
+              test: ubuntu2204
 
   - stage: Docker_2_14
     displayName: Docker 2.14
@@ -145,52 +171,31 @@ stages:
           targets:
             - name: CentOS 7
               test: centos7
-            - name: Fedora 36
-              test: fedora36
             - 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: CentOS 7
-              test: centos7
-            - name: Fedora 35
-              test: fedora35
-            - name: Ubuntu 20.04
-              test: ubuntu2004
-
-  - stage: Docker_2_12
-    displayName: Docker 2.12
+## Remote
+  - stage: Remote_devel
+    displayName: Remote devel
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.12/linux/{0}/1
+          testFormat: devel/{0}/1
           targets:
-            - name: CentOS 7
-              test: centos7
-            - name: Fedora 34
-              test: fedora34
-            - name: Ubuntu 20.04
-              test: ubuntu2004
+            - name: RHEL 9.3
+              test: rhel/9.3
 
-## Remote
-  - stage: Remote_devel
-    displayName: Remote devel
+  - stage: Remote_2_16
+    displayName: Remote 2.16
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: devel/{0}/1
+          testFormat: 2.16/{0}/1
           targets:
-            - name: RHEL 8.7
-              test: rhel/8.7
+            - name: RHEL 8.8
+              test: rhel/8.8
 
   - stage: Remote_2_15
     displayName: Remote 2.15
@@ -214,47 +219,22 @@ stages:
             - name: RHEL 8.6
               test: rhel/8.6
 
-  - stage: Remote_2_13
-    displayName: Remote 2.13
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.13/{0}/1
-          targets:
-            - name: RHEL 8.5
-              test: rhel/8.5
-
-  - stage: Remote_2_12
-    displayName: Remote 2.12
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.12/{0}/1
-          targets:
-            - name: RHEL 8.4
-              test: rhel/8.4
-
 ## Finally
 
   - stage: Summary
     condition: succeededOrFailed()
     dependsOn:
       - Ansible_devel
+      - Ansible_2_16
       - Ansible_2_15
       - Ansible_2_14
-      - Ansible_2_13
-      - Ansible_2_12
       - Docker_devel
+      - Docker_2_16
       - Docker_2_15
       - Docker_2_14
-      - Docker_2_13
-      - Docker_2_12
       - Remote_devel
+      - Remote_2_16
       - Remote_2_15
       - Remote_2_14
-      - Remote_2_13
-      - Remote_2_12
     jobs:
       - template: templates/coverage.yml
diff --git a/ansible_collections/community/postgresql/.azure-pipelines/scripts/combine-coverage.py b/ansible_collections/community/postgresql/.azure-pipelines/scripts/combine-coverage.py
index 506ade646..3c3a7ecea 100755
--- a/ansible_collections/community/postgresql/.azure-pipelines/scripts/combine-coverage.py
+++ b/ansible_collections/community/postgresql/.azure-pipelines/scripts/combine-coverage.py
@@ -7,7 +7,8 @@ Keep in mind that Azure Pipelines does not enforce unique job display names (onl
 It is up to pipeline authors to avoid name collisions when deviating from the recommended format.
 """
 
-from __future__ import (absolute_import, division, print_function)
+from __future__ import absolute_import, division, print_function
+
 __metaclass__ = type
 
 import os
diff --git a/ansible_collections/community/postgresql/.azure-pipelines/scripts/time-command.py b/ansible_collections/community/postgresql/.azure-pipelines/scripts/time-command.py
index 5e8eb8d4c..400528798 100755
--- a/ansible_collections/community/postgresql/.azure-pipelines/scripts/time-command.py
+++ b/ansible_collections/community/postgresql/.azure-pipelines/scripts/time-command.py
@@ -1,7 +1,8 @@
 #!/usr/bin/env python
 """Prepends a relative timestamp to each input line from stdin and writes it to stdout."""
 
-from __future__ import (absolute_import, division, print_function)
+from __future__ import absolute_import, division, print_function
+
 __metaclass__ = type
 
 import sys