2022-06-01-00

.azure-pipelines/azure-pipelines.yml

@@ -43,94 +43,94 @@ pool: Standard
 stages:
 
 ## Docker
-  - stage: Docker_devel
-    displayName: Docker devel
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: devel/linux/{0}
-          targets:
-            - name: CentOS 7
-              test: centos7
-            - name: Fedora 35
-              test: fedora35
-            - name: Fedora 36
-              test: fedora36
-            - name: openSUSE 15 py3
-              test: opensuse15
-            - name: Ubuntu 20.04
-              test: ubuntu2004
-            - name: Ubuntu 22.04
-              test: ubuntu2204
-  - 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 34
-              test: fedora34
-            - name: Fedora 35
-              test: fedora35
-            - name: openSUSE 15 py3
-              test: opensuse15
-            - 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: CentOS 6
-              test: centos6
-            - name: CentOS 7
-              test: centos7
-            - name: Fedora 33
-              test: fedora33
-            - name: Fedora 34
-              test: fedora34
-            - 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_11
-    displayName: Docker 2.11
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.11/linux/{0}/1
-          targets:
-            - 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_devel
+#    displayName: Docker devel
+#    dependsOn: []
+#    jobs:
+#      - template: templates/matrix.yml
+#        parameters:
+#          testFormat: devel/linux/{0}/1
+#          targets:
+#            - name: CentOS 7
+#              test: centos7
+#            - name: Fedora 35
+#              test: fedora35
+#            - name: Fedora 36
+#              test: fedora36
+#            - name: openSUSE 15 py3
+#              test: opensuse15
+#            - name: Ubuntu 20.04
+#              test: ubuntu2004
+#            - name: Ubuntu 22.04
+#              test: ubuntu2204
+#  - 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 34
+#              test: fedora34
+#            - name: Fedora 35
+#              test: fedora35
+#            - name: openSUSE 15 py3
+#              test: opensuse15
+#            - 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: CentOS 6
+#              test: centos6
+#            - name: CentOS 7
+#              test: centos7
+#            - name: Fedora 33
+#              test: fedora33
+#            - name: Fedora 34
+#              test: fedora34
+#            - 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_11
+#    displayName: Docker 2.11
+#    dependsOn: []
+#    jobs:
+#      - template: templates/matrix.yml
+#        parameters:
+#          testFormat: 2.11/linux/{0}/1
+#          targets:
+#            - 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_9
     displayName: Docker 2.9
     dependsOn: []
@@ -157,78 +157,78 @@ stages:
               test: ubuntu1804
 
 ## Remote
-  - stage: Remote_devel
-    displayName: Remote devel
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: devel/{0}/1
-          targets:
-            - name: MacOS 12.0
-              test: macos/12.0
-            - name: RHEL 7.9
-              test: rhel/7.9
-            - name: RHEL 8.6
-              test: rhel/8.6
-            - name: RHEL 9.0
-              test: rhel/9.0
-            - name: FreeBSD 12.3
-              test: freebsd/12.3
-            - name: FreeBSD 13.1
-              test: freebsd/13.1
-  - stage: Remote_2_13
-    displayName: Remote 2.13
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.13/{0}/1
-          targets:
-            - name: MacOS 12.0
-              test: macos/12.0
-            - name: RHEL 7.9
-              test: rhel/7.9
-            - name: RHEL 8.5
-              test: rhel/8.5
-            - name: FreeBSD 12.3
-              test: freebsd/12.3
-            - name: FreeBSD 13.0
-              test: freebsd/13.0
-  - stage: Remote_2_12
-    displayName: Remote 2.12
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.12/{0}/1
-          targets:
-            - name: MacOS 11.1
-              test: macos/11.1
-            - name: RHEL 7.9
-              test: rhel/7.9
-            - name: RHEL 8.4
-              test: rhel/8.4
-            - name: FreeBSD 12.2
-              test: freebsd/12.2
-            - name: FreeBSD 13.0
-              test: freebsd/13.0
-  - stage: Remote_2_11
-    displayName: Remote 2.11
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.11/{0}/1
-          targets:
-            - name: MacOS 11.1
-              test: macos/11.1
-            - name: RHEL 7.9
-              test: rhel/7.9
-            - name: RHEL 8.3
-              test: rhel/8.3
-            - name: FreeBSD 12.2
-              test: freebsd/12.2
+#  - stage: Remote_devel
+#    displayName: Remote devel
+#    dependsOn: []
+#    jobs:
+#      - template: templates/matrix.yml
+#        parameters:
+#          testFormat: devel/{0}/1
+#          targets:
+#            - name: MacOS 12.0
+#              test: macos/12.0
+#            - name: RHEL 7.9
+#              test: rhel/7.9
+#            - name: RHEL 8.6
+#              test: rhel/8.6
+#            - name: RHEL 9.0
+#              test: rhel/9.0
+#            - name: FreeBSD 12.3
+#              test: freebsd/12.3
+#            - name: FreeBSD 13.1
+#              test: freebsd/13.1
+#  - stage: Remote_2_13
+#    displayName: Remote 2.13
+#    dependsOn: []
+#    jobs:
+#      - template: templates/matrix.yml
+#        parameters:
+#          testFormat: 2.13/{0}/1
+#          targets:
+#            - name: MacOS 12.0
+#              test: macos/12.0
+#            - name: RHEL 7.9
+#              test: rhel/7.9
+#            - name: RHEL 8.5
+#              test: rhel/8.5
+#            - name: FreeBSD 12.3
+#              test: freebsd/12.3
+#            - name: FreeBSD 13.0
+#              test: freebsd/13.0
+#  - stage: Remote_2_12
+#    displayName: Remote 2.12
+#    dependsOn: []
+#    jobs:
+#      - template: templates/matrix.yml
+#        parameters:
+#          testFormat: 2.12/{0}/1
+#          targets:
+#            - name: MacOS 11.1
+#              test: macos/11.1
+#            - name: RHEL 7.9
+#              test: rhel/7.9
+#            - name: RHEL 8.4
+#              test: rhel/8.4
+#            - name: FreeBSD 12.2
+#              test: freebsd/12.2
+#            - name: FreeBSD 13.0
+#              test: freebsd/13.0
+#  - stage: Remote_2_11
+#    displayName: Remote 2.11
+#    dependsOn: []
+#    jobs:
+#      - template: templates/matrix.yml
+#        parameters:
+#          testFormat: 2.11/{0}/1
+#          targets:
+#            - name: MacOS 11.1
+#              test: macos/11.1
+#            - name: RHEL 7.9
+#              test: rhel/7.9
+#            - name: RHEL 8.3
+#              test: rhel/8.3
+#            - name: FreeBSD 12.2
+#              test: freebsd/12.2
   - stage: Remote_2_9
     displayName: Remote 2.9
     dependsOn: []
@@ -249,13 +249,13 @@ stages:
     dependsOn:
       - Remote_2_9
       - Docker_2_9
-      - Remote_2_11
-      - Docker_2_11
-      - Remote_2_12
-      - Docker_2_12
-      - Remote_2_13
-      - Docker_2_13
-      - Remote_devel
-      - Docker_devel
+#      - Remote_2_11
+#      - Docker_2_11
+#      - Remote_2_12
+#      - Docker_2_12
+#      - Remote_2_13
+#      - Docker_2_13
+#      - Remote_devel
+#      - Docker_devel
     jobs:
       - template: templates/coverage.yml

tests/utils/shippable/linux.sh

@@ -14,5 +14,5 @@ else
 fi
 
 # shellcheck disable=SC2086
-ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \
-    --docker "${image}"
+#ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \
+#    --docker "${image}"

tests/utils/shippable/remote.sh

@@ -18,5 +18,6 @@ stage="${S:-prod}"
 provider="${P:-default}"
 
 # shellcheck disable=SC2086
+ansible-galaxy collection install -f community.general:4.8.1
 ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \
     --remote "${platform}/${version}" --remote-terminate always --remote-stage "${stage}" --remote-provider "${provider}"

tests/utils/shippable/shippable.sh

@@ -70,8 +70,7 @@ if [ "${SHIPPABLE_BUILD_ID:-}" ]; then
     cp -aT "${SHIPPABLE_BUILD_DIR}" "${TEST_DIR}"
     cd "${TEST_DIR}"
 else
-    export ANSIBLE_COLLECTIONS_PATHS="${HOME}/.ansible"
-    #export ANSIBLE_COLLECTIONS_PATHS="${PWD}/../../../"
+    export ANSIBLE_COLLECTIONS_PATHS="${PWD}/../../../"
 fi
 
 # START: HACK install dependencies