Change CI group identifiers. (#5344) (#5347)

(cherry picked from commit e47845a) Co-authored-by: Felix Fontein <felix@fontein.de>
ansible-collections · Oct 11, 2022 · 68e184e · 68e184e
1 parent 5dcd2c7
commit 68e184e
Show file tree

Hide file tree

Showing 131 changed files with 156 additions and 158 deletions.
diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
@@ -392,56 +392,56 @@ stages:
             - 2
             - 3
 
-### Cloud
-  - stage: Cloud_devel
-    displayName: Cloud devel
+### Generic
+  - stage: Generic_devel
+    displayName: Generic devel
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           nameFormat: Python {0}
-          testFormat: devel/cloud/{0}/1
+          testFormat: devel/generic/{0}/1
           targets:
             - test: 2.7
             - test: '3.11'
-  - stage: Cloud_2_14
-    displayName: Cloud 2.14
+  - stage: Generic_2_14
+    displayName: Generic 2.14
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           nameFormat: Python {0}
-          testFormat: 2.14/cloud/{0}/1
+          testFormat: 2.14/generic/{0}/1
           targets:
             - test: '3.10'
-  - stage: Cloud_2_13
-    displayName: Cloud 2.13
+  - stage: Generic_2_13
+    displayName: Generic 2.13
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           nameFormat: Python {0}
-          testFormat: 2.13/cloud/{0}/1
+          testFormat: 2.13/generic/{0}/1
           targets:
             - test: 3.9
-  - stage: Cloud_2_12
-    displayName: Cloud 2.12
+  - stage: Generic_2_12
+    displayName: Generic 2.12
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           nameFormat: Python {0}
-          testFormat: 2.12/cloud/{0}/1
+          testFormat: 2.12/generic/{0}/1
           targets:
             - test: 3.8
-  - stage: Cloud_2_11
-    displayName: Cloud 2.11
+  - stage: Generic_2_11
+    displayName: Generic 2.11
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           nameFormat: Python {0}
-          testFormat: 2.11/cloud/{0}/1
+          testFormat: 2.11/generic/{0}/1
           targets:
             - test: 2.7
             - test: 3.5
@@ -470,10 +470,10 @@ stages:
       - Docker_2_13
       - Docker_2_14
       - Docker_community_devel
-      - Cloud_devel
-      - Cloud_2_11
-      - Cloud_2_12
-      - Cloud_2_13
-      - Cloud_2_14
+      - Generic_devel
+      - Generic_2_11
+      - Generic_2_12
+      - Generic_2_13
+      - Generic_2_14
     jobs:
       - template: templates/coverage.yml
diff --git a/tests/integration/targets/alerta_customer/aliases b/tests/integration/targets/alerta_customer/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 disabled
diff --git a/tests/integration/targets/alternatives/aliases b/tests/integration/targets/alternatives/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group3
+azp/posix/3
 destructive
 needs/root
 skip/aix

diff --git a/tests/integration/targets/ansible_galaxy_install/aliases b/tests/integration/targets/ansible_galaxy_install/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/3
 destructive
-shippable/posix/group3
 skip/python2.6
 context/controller  # While this is not really true, this module mainly is run on the controller, *and* needs access to the ansible-galaxy CLI tool
diff --git a/tests/integration/targets/apache2_module/aliases b/tests/integration/targets/apache2_module/aliases
@@ -2,6 +2,6 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/3
 destructive
-shippable/posix/group3
 skip/aix
diff --git a/tests/integration/targets/archive/aliases b/tests/integration/targets/archive/aliases
@@ -2,8 +2,8 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/2
 needs/root
-shippable/posix/group2
 destructive
 skip/aix
 skip/osx  # FIXME
diff --git a/tests/integration/targets/callback_diy/aliases b/tests/integration/targets/callback_diy/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group3
+azp/posix/3
 needs/target/callback
diff --git a/tests/integration/targets/callback_log_plays/aliases b/tests/integration/targets/callback_log_plays/aliases
@@ -2,4 +2,4 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group3
+azp/posix/3
diff --git a/tests/integration/targets/callback_yaml/aliases b/tests/integration/targets/callback_yaml/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 needs/target/callback
diff --git a/tests/integration/targets/cargo/aliases b/tests/integration/targets/cargo/aliases
@@ -2,6 +2,6 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/2
 destructive
-shippable/posix/group2
 skip/aix
diff --git a/tests/integration/targets/cloud_init_data_facts/aliases b/tests/integration/targets/cloud_init_data_facts/aliases
@@ -2,8 +2,8 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/1
 destructive
-shippable/posix/group1
 skip/aix
 skip/osx
 skip/macos

diff --git a/tests/integration/targets/cmd_runner/aliases b/tests/integration/targets/cmd_runner/aliases
@@ -2,4 +2,4 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
diff --git a/tests/integration/targets/connection_chroot/aliases b/tests/integration/targets/connection_chroot/aliases
@@ -2,6 +2,6 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/3
 needs/root
-shippable/posix/group3
 skip/macos # Skipped due to limitation of macOS 10.15 SIP, please read https://github.com/ansible-collections/community.general/issues/1017#issuecomment-755088895
diff --git a/tests/integration/targets/consul/aliases b/tests/integration/targets/consul/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 destructive
 skip/aix
 skip/macos  # cannot simply create binaries in system locations on newer macOS versions
diff --git a/tests/integration/targets/copr/aliases b/tests/integration/targets/copr/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 needs/root
 skip/macos
 skip/osx

diff --git a/tests/integration/targets/cpanm/aliases b/tests/integration/targets/cpanm/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group3
+azp/posix/3
 destructive
 skip/macos
 skip/osx

diff --git a/tests/integration/targets/cronvar/aliases b/tests/integration/targets/cronvar/aliases
@@ -2,8 +2,8 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/3
 destructive
-shippable/posix/group3
 skip/aix
 skip/osx
 skip/macos
diff --git a/tests/integration/targets/deploy_helper/aliases b/tests/integration/targets/deploy_helper/aliases
@@ -2,4 +2,4 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
diff --git a/tests/integration/targets/django_manage/aliases b/tests/integration/targets/django_manage/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/python2
 skip/freebsd
 skip/macos

diff --git a/tests/integration/targets/dnf_versionlock/aliases b/tests/integration/targets/dnf_versionlock/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 skip/aix
 skip/freebsd
 skip/osx

diff --git a/tests/integration/targets/dpkg_divert/aliases b/tests/integration/targets/dpkg_divert/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 skip/aix
 skip/osx
 skip/macos

diff --git a/tests/integration/targets/etcd3/aliases b/tests/integration/targets/etcd3/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 destructive
 skip/aix
 skip/osx

diff --git a/tests/integration/targets/filesize/aliases b/tests/integration/targets/filesize/aliases
@@ -2,4 +2,4 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
diff --git a/tests/integration/targets/filesystem/aliases b/tests/integration/targets/filesystem/aliases
@@ -2,8 +2,8 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+azp/posix/1
 destructive
-shippable/posix/group1
 skip/aix
 skip/osx
 skip/macos
diff --git a/tests/integration/targets/filter_counter/aliases b/tests/integration/targets/filter_counter/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/python2.6  # filters are controller only, and we no longer support Python 2.6 on the controller
diff --git a/tests/integration/targets/filter_dict/aliases b/tests/integration/targets/filter_dict/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group3
+azp/posix/3
 skip/python2.6  # filters are controller only, and we no longer support Python 2.6 on the controller
diff --git a/tests/integration/targets/filter_dict_kv/aliases b/tests/integration/targets/filter_dict_kv/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/python2.6  # filters are controller only, and we no longer support Python 2.6 on the controller
diff --git a/tests/integration/targets/filter_from_csv/aliases b/tests/integration/targets/filter_from_csv/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/python2.6  # filters are controller only, and we no longer support Python 2.6 on the controller
diff --git a/tests/integration/targets/filter_groupby_as_dict/aliases b/tests/integration/targets/filter_groupby_as_dict/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group3
+azp/posix/3
 skip/python2.6  # filters are controller only, and we no longer support Python 2.6 on the controller
diff --git a/tests/integration/targets/filter_hashids/aliases b/tests/integration/targets/filter_hashids/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/python2.6  # filters are controller only, and we no longer support Python 2.6 on the controller
diff --git a/tests/integration/targets/filter_jc/aliases b/tests/integration/targets/filter_jc/aliases
@@ -2,6 +2,6 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/python2.6  # filters are controller only, and we no longer support Python 2.6 on the controller
 skip/python2.7  # jc only supports python3.x
diff --git a/tests/integration/targets/filter_json_query/aliases b/tests/integration/targets/filter_json_query/aliases
@@ -2,6 +2,6 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/python2.6  # filters are controller only, and we no longer support Python 2.6 on the controller
 skip/aix
diff --git a/tests/integration/targets/filter_lists_mergeby/aliases b/tests/integration/targets/filter_lists_mergeby/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/python2.6  # filters are controller only, and we no longer support Python 2.6 on the controller
diff --git a/tests/integration/targets/filter_path_join_shim/aliases b/tests/integration/targets/filter_path_join_shim/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group1
+azp/posix/1
 skip/python2.6  # filters are controller only, and we no longer support Python 2.6 on the controller
diff --git a/tests/integration/targets/filter_random_mac/aliases b/tests/integration/targets/filter_random_mac/aliases
@@ -2,6 +2,6 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/python2.6  # filters are controller only, and we no longer support Python 2.6 on the controller
 skip/aix
diff --git a/tests/integration/targets/filter_time/aliases b/tests/integration/targets/filter_time/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/python2.6  # filters are controller only, and we no longer support Python 2.6 on the controller
diff --git a/tests/integration/targets/filter_unicode_normalize/aliases b/tests/integration/targets/filter_unicode_normalize/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/python2.6  # filters are controller only, and we no longer support Python 2.6 on the controller
diff --git a/tests/integration/targets/filter_version_sort/aliases b/tests/integration/targets/filter_version_sort/aliases
@@ -2,5 +2,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group2
+azp/posix/2
 skip/python2.6  # filters are controller only, and we no longer support Python 2.6 on the controller
diff --git a/tests/integration/targets/flatpak/aliases b/tests/integration/targets/flatpak/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group3
+azp/posix/3
 destructive
 skip/aix
 skip/freebsd

diff --git a/tests/integration/targets/flatpak_remote/aliases b/tests/integration/targets/flatpak_remote/aliases
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shippable/posix/group3
+azp/posix/3
 destructive
 skip/aix
 skip/freebsd