Merge remote-tracking branch 'origin/main' into feat/add_save_command…

…_result
ansible-collections · Nov 17, 2021 · 00b9c10 · 00b9c10
2 parents 41f6633 + dafbd85
commit 00b9c10
Show file tree

Hide file tree

Showing 265 changed files with 3,352 additions and 39,529 deletions.
diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
@@ -13,7 +13,7 @@ pr:
       - stable-*
 
 schedules:
-  - cron: 0 9 * * *
+  - cron: 0 8 * * *
     displayName: Nightly
     always: true
     branches:
@@ -36,7 +36,7 @@ variables:
 resources:
   containers:
     - container: default
-      image: quay.io/ansible/azure-pipelines-test-container:1.7.1
+      image: quay.io/ansible/azure-pipelines-test-container:1.9.0
 
 pool: Standard
 
@@ -57,6 +57,37 @@ stages:
             - test: 4
             - test: 5
             - test: extra
+
+  - stage: Sanity_2_12
+    displayName: Sanity 2.12
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          nameFormat: Test {0}
+          testFormat: 2.12/sanity/{0}
+          targets:
+            - test: 1
+            - test: 2
+            - test: 3
+            - test: 4
+            - test: 5
+
+  - stage: Sanity_2_11
+    displayName: Sanity 2.11
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          nameFormat: Test {0}
+          testFormat: 2.11/sanity/{0}
+          targets:
+            - test: 1
+            - test: 2
+            - test: 3
+            - test: 4
+            - test: 5
+
   - stage: Sanity_2_10
     displayName: Sanity 2.10
     dependsOn: []
@@ -71,6 +102,7 @@ stages:
             - test: 3
             - test: 4
             - test: 5
+
   - stage: Sanity_2_9
     displayName: Sanity 2.9
     dependsOn: []
@@ -94,6 +126,30 @@ stages:
         parameters:
           nameFormat: Python {0}
           testFormat: devel/units/{0}/1
+          targets:
+            - test: 3.8
+            - test: 3.9
+
+  - stage: Units_2_12
+    displayName: Units 2.12
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          nameFormat: Python {0}
+          testFormat: 2.12/units/{0}/1
+          targets:
+            - test: 3.8
+            - test: 3.9
+
+  - stage: Units_2_11
+    displayName: Units 2.11
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          nameFormat: Python {0}
+          testFormat: 2.11/units/{0}/1
           targets:
             - test: 2.6
             - test: 2.7
@@ -102,6 +158,7 @@ stages:
             - test: 3.7
             - test: 3.8
             - test: 3.9
+
   - stage: Units_2_10
     displayName: Units 2.10
     dependsOn: []
@@ -118,6 +175,7 @@ stages:
             - test: 3.7
             - test: 3.8
             - test: 3.9
+
   - stage: Units_2_9
     displayName: Units 2.9
     dependsOn: []
@@ -133,120 +191,83 @@ stages:
             - test: 3.6
             - test: 3.7
             - test: 3.8
-### Docker
-  - stage: Docker_devel
-    displayName: Docker devel
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: devel/linux/{0}/1
-          targets:
-            - name: CentOS 6
-              test: centos6
-            - name: CentOS 7
-              test: centos7
-            - name: CentOS 8
-              test: centos8
-            - name: Fedora 31
-              test: fedora31
-            - name: Fedora 32
-              test: fedora32
-            - name: openSUSE 15 py2
-              test: opensuse15py2
-            - name: openSUSE 15 py3
-              test: opensuse15
-            - name: Ubuntu 16.04
-              test: ubuntu1604
-            - name: Ubuntu 18.04
-              test: ubuntu1804
-  - stage: Docker_2_10
-    displayName: Docker 2.10
+### Cloud
+  - stage: Cloud_devel
+    displayName: Cloud devel
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.10/linux/{0}/1
+          nameFormat: Python {0}
+          testFormat: devel/cloud/{0}/1
           targets:
-            - name: CentOS 8
-              test: centos8
-            - name: Fedora 32
-              test: fedora32
-            - name: openSUSE 15 py3
-              test: opensuse15
-            - name: Ubuntu 18.04
-              test: ubuntu1804
-
-  - stage: Docker_2_9
-    displayName: Docker 2.9
+            - test: 3.8
+            - test: 3.9
+            - test: "3.10"
+
+  - stage: Cloud_2_12
+    displayName: Cloud 2.12
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.9/linux/{0}/1
+          nameFormat: Python {0}
+          testFormat: 2.12/cloud/{0}/1
           targets:
-            - name: CentOS 7
-              test: centos7
-            - name: Fedora 31
-              test: fedora31
-            - name: openSUSE 15 py2
-              test: opensuse15py2
-            - name: Ubuntu 16.04
-              test: ubuntu1604
-
-### Remote
-  - stage: Remote_devel
-    displayName: Remote devel
+            - test: 3.8
+            - test: 3.9
+            - test: "3.10"
+
+  - stage: Cloud_2_11
+    displayName: Cloud 2.11
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: devel/{0}/1
+          nameFormat: Python {0}
+          testFormat: 2.11/cloud/{0}/1
           targets:
-            - 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_10
-    displayName: Remote 2.10
+            - test: 3.8
+
+  - stage: Cloud_2_10
+    displayName: Cloud 2.10
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.10/{0}/1
+          nameFormat: Python {0}
+          testFormat: 2.10/cloud/{0}/1
           targets:
-            - name: RHEL 8.2
-              test: rhel/8.2
-            - name: FreeBSD 12.1
-              test: freebsd/12.1
-  - stage: Remote_2_9
-    displayName: Remote 2.9
+            - test: 3.6
+
+  - stage: Cloud_2_9
+    displayName: Cloud 2.9
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.9/{0}/1
+          nameFormat: Python {0}
+          testFormat: 2.9/cloud/{0}/1
           targets:
-            - name: RHEL 8.1
-              test: rhel/8.1
-            - name: FreeBSD 11.1
-              test: freebsd/11.1
+            - test: 3.5
+### Finally
   - stage: Summary
     condition: succeededOrFailed()
     dependsOn:
       - Sanity_devel
+      - Sanity_2_12
+      - Sanity_2_11
       - Sanity_2_10
       - Sanity_2_9
       - Units_devel
+      - Units_2_12
+      - Units_2_11
       - Units_2_10
       - Units_2_9
-      - Remote_devel
-      - Docker_devel
-      - Remote_2_10
-      - Docker_2_10
-      - Remote_2_9
-      - Docker_2_9
+      - Cloud_devel
+      - Cloud_2_12
+      - Cloud_2_11
+      - Cloud_2_10
+      - Cloud_2_9
     jobs:
       - template: templates/coverage.yml
diff --git a/.azure-pipelines/scripts/publish-codecov.sh b/.azure-pipelines/scripts/publish-codecov.sh
@@ -7,7 +7,7 @@ set -o pipefail -eu
 
 output_path="$1"
 
-curl --silent --show-error https://codecov.io/bash > codecov.sh
+curl --silent --show-error https://ansible-ci-files.s3.us-east-1.amazonaws.com/codecov/codecov.sh > codecov.sh
 
 for file in "${output_path}"/reports/coverage*.xml; do
     name="${file}"

diff --git a/.github/BOTMETA.yml b/.github/BOTMETA.yml
@@ -1,4 +1,5 @@
 automerge: false
+notifications: true
 files:
   $actions/aireos.py:
     labels: aireos cisco networking
@@ -46,7 +47,7 @@ files:
     maintainers: $team_networking
     labels: networking
   $httpapis/exos.py:
-    maintainers: $team_networking LindsayHill bigmstone ujwalkomarla
+    maintainers: $team_networking LindsayHill ujwalkomarla
     labels: exos networking
   $httpapis/ftd.py:
     maintainers: $team_networking annikulin
@@ -95,8 +96,6 @@ files:
   $module_utils/network/f5/:
     maintainers: caphrim007 wojtek0806
     labels: networking
-  $module_utils/network/fortianalyzer/:
-    labels: networking
   $module_utils/network/ftd/:
     maintainers: $team_ftd
     labels: cisco networking
@@ -219,10 +218,11 @@ files:
   $modules/network/cumulus/nclu.py:
     authors: isharacomix
     maintainers: jrrivers
-  $modules/network/edgeos/edgeos_command.py:
-    authors: beardymcbeards samdoran
   $modules/network/edgeos/:
     authors: Qalthos samdoran
+    maintainers: $team_edgeos
+  $modules/network/edgeos/edgeos_command.py:
+    authors: beardymcbeards samdoran
   $modules/network/edgeswitch/:
     authors: f-bor
   $modules/network/enos/:
@@ -237,13 +237,13 @@ files:
     maintainers: $team_extreme rdvencioneck
   $modules/network/exos/exos_facts.py:
     authors: hlrichardson ujwalkomarla
-    maintainers: LindsayHill bigmstone rdvencioneck
+    maintainers: LindsayHill rdvencioneck
   $modules/network/exos/exos_l2_interfaces.py:
     authors: jayalakshmiV
     maintainers: $team_extreme rdvencioneck
   $modules/network/exos/exos_lldp_global.py:
     authors: ujwalkomarla
-    maintainers: LindsayHill bigmstone rdvencioneck
+    maintainers: LindsayHill rdvencioneck
   $modules/network/exos/exos_lldp_interfaces.py:
     authors: JayalakshmiV
     maintainers: $team_extreme rdvencioneck
@@ -262,20 +262,6 @@ files:
   $modules/network/f5/bigiq_device_facts.py:
     authors: caphrim007
     maintainers: wojtek0806
-  $modules/network/fortianalyzer/faz_device.py:
-    authors: lweighall
-  $modules/network/fortimanager/:
-    authors: Ghilli3 lweighall p4r4n0y1ng
-    maintainers: Ftntcorecse
-  $modules/network/fortimanager/fmgr_provisioning.py:
-    authors: Ghilli3
-    maintainers: Ftntcorecse lweighall p4r4n0y1ng
-  $modules/network/fortimanager/fmgr_query.py:
-    authors: lweighall
-    maintainers: Ftntcorecse Ghilli3 p4r4n0y1ng
-  $modules/network/fortimanager/fmgr_script.py:
-    authors: Ghilli3
-    maintainers: Ftntcorecse lweighall p4r4n0y1ng
   $modules/network/ftd/:
     authors: annikulin
     labels: cisco networking
@@ -304,7 +290,7 @@ files:
     maintainers: $team_netvisor
   $modules/network/nos/:
     authors: LindsayHill
-    maintainers: bigmstone ujwalkomarla
+    maintainers: ujwalkomarla
   $modules/network/nuage/nuage_vspk.py:
     authors: pdellaert
   $modules/network/opx/opx_cps.py:
@@ -317,6 +303,7 @@ files:
   $modules/network/slxos/:
     authors: bigmstone
     maintainers: LindsayHill ujwalkomarla
+    ignore: bigmstone
   $modules/network/slxos/slxos_vlan.py:
     authors: lindsayhill
     maintainers: $team_extreme
@@ -378,8 +365,9 @@ macros:
   team_aci: aciguru brunocalogero devarshishah3 fadallar jmcgill298 koladiya mtorelli rsmeyers schunduri smnmtzgr
   team_aruba: karthikeyan-dhandapani
   team_avi: ericsysmin grastogi23 khaltore
-  team_e_spirit: MatrixCrawler getjack
-  team_extreme: LindsayHill bigmstone ujwalkomarla
+  team_e_spirit: MatrixCrawler
+  team_edgeos: Qalthos samdoran jplitza virtualguy
+  team_extreme: LindsayHill ujwalkomarla
   team_ftd: annikulin
   team_huawei: QijunPan TommyLike edisonxiang freesky-edward hwDCN niuzhenguo xuxiaowei0512 yanzhangi zengchen1024 zhongjun2
   team_lenovo: istaicu mihaibroc