[PR #600/e6904c2d backport][stable-4] AZP: update test container info (…

…#602) * AZP: update test container info (#600) * AZP: update test container info * Update ansible-core test targets * Tmp * add ignore.txt * Add entries * Add entry (cherry picked from commit e6904c2) * Update ignore-2.18.txt * Update ignore-2.18.txt --------- Co-authored-by: Andrew Klychkov <[email protected]>
ansible-collections · Jun 13, 2024 · dad1b81 · dad1b81
1 parent dee43e5
commit dad1b81
Show file tree

Hide file tree

Showing 3 changed files with 952 additions and 78 deletions.
diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
@@ -64,14 +64,14 @@ stages:
             - test: 5
             - test: extra
 
-  - stage: Sanity_2_16
-    displayName: Sanity 2.16
+  - stage: Sanity_2_17
+    displayName: Sanity 2.17
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           nameFormat: Test {0}
-          testFormat: 2.16/sanity/{0}
+          testFormat: 2.17/sanity/{0}
           targets:
             - test: 1
             - test: 2
@@ -80,14 +80,14 @@ stages:
             - test: 5
             - test: extra
 
-  - stage: Sanity_2_15
-    displayName: Sanity 2.15
+  - stage: Sanity_2_16
+    displayName: Sanity 2.16
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           nameFormat: Test {0}
-          testFormat: 2.15/sanity/{0}
+          testFormat: 2.16/sanity/{0}
           targets:
             - test: 1
             - test: 2
@@ -96,35 +96,21 @@ stages:
             - test: 5
             - test: extra
 
-  - stage: Sanity_2_14
-    displayName: Sanity 2.14
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Test {0}
-          testFormat: 2.14/sanity/{0}
-          targets:
-            - test: 1
-            - test: 2
-            - test: 3
-            - test: 4
-            - test: 5
-
-  - stage: Sanity_2_13
-    displayName: Sanity 2.13
+  - stage: Sanity_2_15
+    displayName: Sanity 2.15
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           nameFormat: Test {0}
-          testFormat: 2.13/sanity/{0}
+          testFormat: 2.15/sanity/{0}
           targets:
             - test: 1
             - test: 2
             - test: 3
             - test: 4
             - test: 5
+            - test: extra
 
 ### Units
   - stage: Units_devel
@@ -138,63 +124,60 @@ stages:
           targets:
             - test: '3.10'
 
-  - stage: Units_2_16
-    displayName: Units 2.16
+  - stage: Units_2_17
+    displayName: Units 2.17
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           nameFormat: Python {0}
-          testFormat: 2.16/units/{0}/1
+          testFormat: 2.17/units/{0}/1
           targets:
             - test: '3.10'
 
-  - stage: Units_2_15
-    displayName: Units 2.15
+  - stage: Units_2_16
+    displayName: Units 2.16
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           nameFormat: Python {0}
-          testFormat: 2.15/units/{0}/1
+          testFormat: 2.16/units/{0}/1
           targets:
             - test: '3.10'
 
-  - stage: Units_2_14
-    displayName: Units 2.14
+  - stage: Units_2_15
+    displayName: Units 2.15
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           nameFormat: Python {0}
-          testFormat: 2.14/units/{0}/1
+          testFormat: 2.15/units/{0}/1
           targets:
             - test: '3.10'
 
-  - stage: Units_2_13
-    displayName: Units 2.13
+### Cloud
+  - stage: Cloud_devel
+    displayName: Cloud devel
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           nameFormat: Python {0}
-          testFormat: 2.13/units/{0}/1
+          testFormat: devel/cloud/{0}/1
           targets:
-            - test: 3.8
-            - test: '3.10'
+            - test: "3.10"
 
-### Cloud
-  - stage: Cloud_devel
-    displayName: Cloud devel
+  - stage: Cloud_2_17
+    displayName: Cloud 2.17
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           nameFormat: Python {0}
-          testFormat: devel/cloud/{0}/1
+          testFormat: 2.17/cloud/{0}/1
           targets:
-            - test: 3.8
-            - test: 3.9
             - test: "3.10"
 
   - stage: Cloud_2_16
@@ -206,8 +189,6 @@ stages:
           nameFormat: Python {0}
           testFormat: 2.16/cloud/{0}/1
           targets:
-            - test: 3.8
-            - test: 3.9
             - test: "3.10"
 
   - stage: Cloud_2_15
@@ -218,32 +199,6 @@ stages:
         parameters:
           nameFormat: Python {0}
           testFormat: 2.15/cloud/{0}/1
-          targets:
-            - test: 3.8
-            - test: 3.9
-            - test: "3.10"
-
-  - stage: Cloud_2_14
-    displayName: Cloud 2.14
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: 2.14/cloud/{0}/1
-          targets:
-            - test: 3.8
-            - test: 3.9
-            - test: "3.10"
-
-  - stage: Cloud_2_13
-    displayName: Cloud 2.13
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: 2.13/cloud/{0}/1
           targets:
             - test: 3.9
             - test: "3.10"
@@ -253,19 +208,16 @@ stages:
     condition: succeededOrFailed()
     dependsOn:
       - Sanity_devel
+      - Sanity_2_17
       - Sanity_2_16
       - Sanity_2_15
-      - Sanity_2_14
-      - Sanity_2_13
       - Units_devel
+      - Units_2_17
       - Units_2_16
       - Units_2_15
-      - Units_2_14
-      - Units_2_13
       - Cloud_devel
+      - Cloud_2_17
       - Cloud_2_16
       - Cloud_2_15
-      - Cloud_2_14
-      - Cloud_2_13
     jobs:
       - template: templates/coverage.yml
diff --git a/tests/sanity/ignore-2.17.txt b/tests/sanity/ignore-2.17.txt
@@ -837,6 +837,7 @@ plugins/module_utils/network/exos/facts/lldp_global/lldp_global.py pylint:unused
 plugins/module_utils/network/exos/facts/lldp_interfaces/lldp_interfaces.py pylint:unused-import
 plugins/module_utils/network/exos/facts/vlans/vlans.py pylint:unused-import
 plugins/module_utils/network/ftd/common.py pylint:unidiomatic-typecheck
+plugins/module_utils/network/ftd/configuration.py pylint:use-yield-from
 plugins/module_utils/network/icx/icx.py pylint:unused-import
 plugins/module_utils/network/ironware/ironware.py pylint:unused-import
 plugins/module_utils/network/netscaler/netscaler.py pylint:unused-import
@@ -909,6 +910,7 @@ plugins/terminal/netvisor.py pylint:unused-import
 plugins/terminal/weos4.py pylint:unused-import
 tests/sanity/extra/botmeta.py pylint:unused-import
 tests/unit/compat/builtins.py pylint:unused-import
+tests/unit/compat/mock.py pylint:use-yield-from
 tests/unit/mock/loader.py pylint:unidiomatic-typecheck
 tests/unit/plugins/httpapi/test_ftd.py pylint:unidiomatic-typecheck
 tests/unit/plugins/modules/network/apconos/test_apconos_command.py pylint:unused-import