From e47845ab3a85ae1747c484cd3b9004be244942c3 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Tue, 11 Oct 2022 07:34:36 +0200 Subject: [PATCH] Change CI group identifiers. (#5344) --- .azure-pipelines/azure-pipelines.yml | 42 +++++++++---------- .../targets/alerta_customer/aliases | 2 +- .../integration/targets/alternatives/aliases | 2 +- .../targets/ansible_galaxy_install/aliases | 2 +- .../targets/apache2_module/aliases | 2 +- tests/integration/targets/archive/aliases | 2 +- .../integration/targets/callback_diy/aliases | 2 +- .../targets/callback_log_plays/aliases | 2 +- .../integration/targets/callback_yaml/aliases | 2 +- tests/integration/targets/cargo/aliases | 2 +- .../targets/cloud_init_data_facts/aliases | 2 +- tests/integration/targets/cmd_runner/aliases | 2 +- .../targets/connection_chroot/aliases | 2 +- tests/integration/targets/consul/aliases | 2 +- tests/integration/targets/copr/aliases | 2 +- tests/integration/targets/cpanm/aliases | 2 +- tests/integration/targets/cronvar/aliases | 2 +- .../integration/targets/deploy_helper/aliases | 2 +- .../integration/targets/django_manage/aliases | 2 +- .../targets/dnf_versionlock/aliases | 2 +- tests/integration/targets/dpkg_divert/aliases | 2 +- tests/integration/targets/etcd3/aliases | 2 +- tests/integration/targets/filesize/aliases | 2 +- tests/integration/targets/filesystem/aliases | 2 +- .../targets/filter_counter/aliases | 2 +- tests/integration/targets/filter_dict/aliases | 2 +- .../targets/filter_dict_kv/aliases | 2 +- .../targets/filter_from_csv/aliases | 2 +- .../targets/filter_groupby_as_dict/aliases | 2 +- .../targets/filter_hashids/aliases | 2 +- tests/integration/targets/filter_jc/aliases | 2 +- .../targets/filter_json_query/aliases | 2 +- .../targets/filter_lists_mergeby/aliases | 2 +- .../targets/filter_path_join_shim/aliases | 2 +- .../targets/filter_random_mac/aliases | 2 +- tests/integration/targets/filter_time/aliases | 2 +- .../targets/filter_unicode_normalize/aliases | 2 +- .../targets/filter_version_sort/aliases | 2 +- tests/integration/targets/flatpak/aliases | 2 +- .../targets/flatpak_remote/aliases | 2 +- tests/integration/targets/gem/aliases | 2 +- tests/integration/targets/git_config/aliases | 2 +- .../integration/targets/github_issue/aliases | 2 +- .../integration/targets/gitlab_branch/aliases | 2 +- .../targets/gitlab_deploy_key/aliases | 2 +- .../integration/targets/gitlab_group/aliases | 2 +- tests/integration/targets/gitlab_hook/aliases | 2 +- .../targets/gitlab_project/aliases | 2 +- .../integration/targets/gitlab_runner/aliases | 2 +- tests/integration/targets/gitlab_user/aliases | 2 +- tests/integration/targets/hg/aliases | 2 +- tests/integration/targets/homebrew/aliases | 2 +- .../integration/targets/homebrew_cask/aliases | 2 +- tests/integration/targets/homectl/aliases | 2 +- .../integration/targets/influxdb_user/aliases | 2 +- tests/integration/targets/ini_file/aliases | 2 +- .../targets/interfaces_file/aliases | 2 +- tests/integration/targets/ipify_facts/aliases | 2 +- .../targets/iptables_state/aliases | 2 +- tests/integration/targets/iso_create/aliases | 2 +- .../integration/targets/iso_customize/aliases | 3 +- tests/integration/targets/iso_extract/aliases | 2 +- tests/integration/targets/java_cert/aliases | 2 +- .../integration/targets/java_keystore/aliases | 2 +- tests/integration/targets/jboss/aliases | 2 +- tests/integration/targets/jira/aliases | 2 +- .../targets/kernel_blacklist/aliases | 2 +- tests/integration/targets/launchd/aliases | 2 +- tests/integration/targets/ldap_search/aliases | 2 +- .../targets/listen_ports_facts/aliases | 2 +- tests/integration/targets/locale_gen/aliases | 2 +- .../targets/lookup_cartesian/aliases | 2 +- .../targets/lookup_collection_version/aliases | 2 +- .../targets/lookup_dependent/aliases | 2 +- tests/integration/targets/lookup_dig/aliases | 2 +- .../integration/targets/lookup_etcd3/aliases | 2 +- .../targets/lookup_flattened/aliases | 2 +- .../targets/lookup_lmdb_kv/aliases | 2 +- .../targets/lookup_passwordstore/aliases | 2 +- .../targets/lookup_random_pet/aliases | 2 +- .../targets/lookup_random_string/aliases | 2 +- .../targets/lookup_random_words/aliases | 2 +- tests/integration/targets/lvg/aliases | 2 +- tests/integration/targets/mail/aliases | 2 +- .../integration/targets/module_helper/aliases | 2 +- tests/integration/targets/monit/aliases | 2 +- tests/integration/targets/mqtt/aliases | 2 +- tests/integration/targets/nomad/aliases | 2 +- tests/integration/targets/npm/aliases | 2 +- tests/integration/targets/odbc/aliases | 2 +- tests/integration/targets/one_host/aliases | 2 +- .../integration/targets/one_template/aliases | 2 +- .../integration/targets/osx_defaults/aliases | 2 +- tests/integration/targets/pacman/aliases | 2 +- tests/integration/targets/pam_limits/aliases | 2 +- tests/integration/targets/pamd/aliases | 2 +- tests/integration/targets/pids/aliases | 2 +- tests/integration/targets/pipx/aliases | 2 +- tests/integration/targets/pipx_info/aliases | 2 +- tests/integration/targets/pkgng/aliases | 2 +- .../targets/python_requirements_info/aliases | 2 +- tests/integration/targets/read_csv/aliases | 2 +- tests/integration/targets/redis_info/aliases | 2 +- tests/integration/targets/rundeck/aliases | 2 +- tests/integration/targets/sefcontext/aliases | 2 +- .../integration/targets/sensu_client/aliases | 2 +- .../integration/targets/sensu_handler/aliases | 2 +- tests/integration/targets/shutdown/aliases | 2 +- tests/integration/targets/snap/aliases | 2 +- tests/integration/targets/snap_alias/aliases | 2 +- tests/integration/targets/ssh_config/aliases | 2 +- tests/integration/targets/sudoers/aliases | 2 +- .../integration/targets/supervisorctl/aliases | 2 +- tests/integration/targets/sysrc/aliases | 2 +- tests/integration/targets/terraform/aliases | 2 +- .../integration/targets/test_a_module/aliases | 2 +- tests/integration/targets/timezone/aliases | 2 +- tests/integration/targets/ufw/aliases | 2 +- tests/integration/targets/wakeonlan/aliases | 2 +- tests/integration/targets/xattr/aliases | 2 +- tests/integration/targets/xfs_quota/aliases | 2 +- tests/integration/targets/xml/aliases | 2 +- tests/integration/targets/yarn/aliases | 2 +- .../targets/yum_versionlock/aliases | 2 +- tests/integration/targets/zypper/aliases | 2 +- .../targets/zypper_repository/aliases | 2 +- tests/sanity/extra/aliases.py | 6 +-- .../utils/shippable/{cloud.sh => generic.sh} | 3 +- tests/utils/shippable/linux-community.sh | 4 +- tests/utils/shippable/linux.sh | 4 +- tests/utils/shippable/remote.sh | 4 +- 131 files changed, 156 insertions(+), 158 deletions(-) rename tests/utils/shippable/{cloud.sh => generic.sh} (90%) diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 7daed5cb12..e590812264 100644 --- 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 index 1a0d20b0b2..d163e8d9ca 100644 --- 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 index d281365a46..f360ac626a 100644 --- 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 index de4a0e413a..13655b1945 100644 --- 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 index 64596c2b12..0d1324b22a 100644 --- 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 index 421f918a39..88b15a24f3 100644 --- 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 index c0ba6c5230..3e2dd244c1 100644 --- 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 index 7a0fc5c1ea..343f119da8 100644 --- 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 index 56b63416e2..a27cf0e26f 100644 --- 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 index 190289e117..9c7febe241 100644 --- 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 index ce552edd9c..bec4d21af6 100644 --- 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 index be75e3ddab..12d1d6617e 100644 --- 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 index 847f93469a..38138ee4d8 100644 --- 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 index 3b6b148f7e..d9cf1eb9ce 100644 --- 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 index 836e186b55..ed3c1af00d 100644 --- 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 index 73181a8621..d30ba06b69 100644 --- 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 index 77e5c4afa2..e9ef7265dc 100644 --- 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 index abc0d5476d..afda346c4e 100644 --- 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 index 0e2bbfeb8e..025fe0ec48 100644 --- 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 index 3cde3b1715..b85ae64190 100644 --- 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 index 39a9de2b1b..050bf89b4a 100644 --- 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 index b8da295be8..264446580b 100644 --- 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 index abc0d5476d..afda346c4e 100644 --- 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 index 86d2291bb5..007bed5386 100644 --- 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 index d3b8ee2b84..bc9b4bc99b 100644 --- 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 index 2ae66ec51c..e8051e0427 100644 --- 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 index d3b8ee2b84..bc9b4bc99b 100644 --- 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 index d3b8ee2b84..bc9b4bc99b 100644 --- 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 index 2ae66ec51c..e8051e0427 100644 --- 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 index d3b8ee2b84..bc9b4bc99b 100644 --- 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 index 49b40f054d..0e799090e8 100644 --- 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 index 08d571c495..cee9abd2ce 100644 --- 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 index d3b8ee2b84..bc9b4bc99b 100644 --- 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 index b7419a24dd..51baa3d7ad 100644 --- 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 index 08d571c495..cee9abd2ce 100644 --- 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 index d3b8ee2b84..bc9b4bc99b 100644 --- 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 index d3b8ee2b84..bc9b4bc99b 100644 --- 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 index d3b8ee2b84..bc9b4bc99b 100644 --- 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 index 3ac0267953..e462ed8cb6 100644 --- 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 index 3ac0267953..e462ed8cb6 100644 --- 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 diff --git a/tests/integration/targets/gem/aliases b/tests/integration/targets/gem/aliases index 86d2291bb5..007bed5386 100644 --- a/tests/integration/targets/gem/aliases +++ b/tests/integration/targets/gem/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/git_config/aliases b/tests/integration/targets/git_config/aliases index 806c0598a4..7b8c653de6 100644 --- a/tests/integration/targets/git_config/aliases +++ b/tests/integration/targets/git_config/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/group3 +azp/posix/3 skip/aix destructive diff --git a/tests/integration/targets/github_issue/aliases b/tests/integration/targets/github_issue/aliases index abaeb52e6d..428e8289dc 100644 --- a/tests/integration/targets/github_issue/aliases +++ b/tests/integration/targets/github_issue/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 +azp/posix/1 destructive -shippable/posix/group1 diff --git a/tests/integration/targets/gitlab_branch/aliases b/tests/integration/targets/gitlab_branch/aliases index 1a0d20b0b2..d163e8d9ca 100644 --- a/tests/integration/targets/gitlab_branch/aliases +++ b/tests/integration/targets/gitlab_branch/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/gitlab_deploy_key/aliases b/tests/integration/targets/gitlab_deploy_key/aliases index 0d1cc45a85..fc0e157c90 100644 --- a/tests/integration/targets/gitlab_deploy_key/aliases +++ b/tests/integration/targets/gitlab_deploy_key/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/group1 +azp/posix/1 gitlab/ci disabled diff --git a/tests/integration/targets/gitlab_group/aliases b/tests/integration/targets/gitlab_group/aliases index 0d1cc45a85..fc0e157c90 100644 --- a/tests/integration/targets/gitlab_group/aliases +++ b/tests/integration/targets/gitlab_group/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/group1 +azp/posix/1 gitlab/ci disabled diff --git a/tests/integration/targets/gitlab_hook/aliases b/tests/integration/targets/gitlab_hook/aliases index 0d1cc45a85..fc0e157c90 100644 --- a/tests/integration/targets/gitlab_hook/aliases +++ b/tests/integration/targets/gitlab_hook/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/group1 +azp/posix/1 gitlab/ci disabled diff --git a/tests/integration/targets/gitlab_project/aliases b/tests/integration/targets/gitlab_project/aliases index 0d1cc45a85..fc0e157c90 100644 --- a/tests/integration/targets/gitlab_project/aliases +++ b/tests/integration/targets/gitlab_project/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/group1 +azp/posix/1 gitlab/ci disabled diff --git a/tests/integration/targets/gitlab_runner/aliases b/tests/integration/targets/gitlab_runner/aliases index 0d1cc45a85..fc0e157c90 100644 --- a/tests/integration/targets/gitlab_runner/aliases +++ b/tests/integration/targets/gitlab_runner/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/group1 +azp/posix/1 gitlab/ci disabled diff --git a/tests/integration/targets/gitlab_user/aliases b/tests/integration/targets/gitlab_user/aliases index 0d1cc45a85..fc0e157c90 100644 --- a/tests/integration/targets/gitlab_user/aliases +++ b/tests/integration/targets/gitlab_user/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/group1 +azp/posix/1 gitlab/ci disabled diff --git a/tests/integration/targets/hg/aliases b/tests/integration/targets/hg/aliases index 8bda40608c..e1d7ab2a2d 100644 --- a/tests/integration/targets/hg/aliases +++ b/tests/integration/targets/hg/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/python3 skip/aix diff --git a/tests/integration/targets/homebrew/aliases b/tests/integration/targets/homebrew/aliases index 8f34f67cb8..11bb9a0860 100644 --- a/tests/integration/targets/homebrew/aliases +++ b/tests/integration/targets/homebrew/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/rhel diff --git a/tests/integration/targets/homebrew_cask/aliases b/tests/integration/targets/homebrew_cask/aliases index 8f34f67cb8..11bb9a0860 100644 --- a/tests/integration/targets/homebrew_cask/aliases +++ b/tests/integration/targets/homebrew_cask/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/rhel diff --git a/tests/integration/targets/homectl/aliases b/tests/integration/targets/homectl/aliases index 8cee099853..8d80bf12c3 100644 --- a/tests/integration/targets/homectl/aliases +++ b/tests/integration/targets/homectl/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/influxdb_user/aliases b/tests/integration/targets/influxdb_user/aliases index 14d23a4da1..8c1a7b3298 100644 --- a/tests/integration/targets/influxdb_user/aliases +++ b/tests/integration/targets/influxdb_user/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 disabled skip/osx skip/macos diff --git a/tests/integration/targets/ini_file/aliases b/tests/integration/targets/ini_file/aliases index be75e3ddab..12d1d6617e 100644 --- a/tests/integration/targets/ini_file/aliases +++ b/tests/integration/targets/ini_file/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/interfaces_file/aliases b/tests/integration/targets/interfaces_file/aliases index be75e3ddab..12d1d6617e 100644 --- a/tests/integration/targets/interfaces_file/aliases +++ b/tests/integration/targets/interfaces_file/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/ipify_facts/aliases b/tests/integration/targets/ipify_facts/aliases index be75e3ddab..12d1d6617e 100644 --- a/tests/integration/targets/ipify_facts/aliases +++ b/tests/integration/targets/ipify_facts/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/iptables_state/aliases b/tests/integration/targets/iptables_state/aliases index 9f4768782b..80f7c7e32f 100644 --- a/tests/integration/targets/iptables_state/aliases +++ b/tests/integration/targets/iptables_state/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/docker # kernel modules not loadable skip/freebsd # no iptables/netfilter (Linux specific) skip/osx # no iptables/netfilter (Linux specific) diff --git a/tests/integration/targets/iso_create/aliases b/tests/integration/targets/iso_create/aliases index f6ee7272f0..4fb0bec810 100644 --- a/tests/integration/targets/iso_create/aliases +++ b/tests/integration/targets/iso_create/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/python2.6 diff --git a/tests/integration/targets/iso_customize/aliases b/tests/integration/targets/iso_customize/aliases index bc011eaf8d..54a0f1a04d 100644 --- a/tests/integration/targets/iso_customize/aliases +++ b/tests/integration/targets/iso_customize/aliases @@ -3,7 +3,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/freebsd @@ -11,4 +11,3 @@ skip/alpine skip/python2.6 skip/docker needs/root - diff --git a/tests/integration/targets/iso_extract/aliases b/tests/integration/targets/iso_extract/aliases index b0d05577af..5b0ab153c8 100644 --- a/tests/integration/targets/iso_extract/aliases +++ b/tests/integration/targets/iso_extract/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/target/setup_epel destructive skip/aix diff --git a/tests/integration/targets/java_cert/aliases b/tests/integration/targets/java_cert/aliases index b9305b0928..573cb189bf 100644 --- a/tests/integration/targets/java_cert/aliases +++ b/tests/integration/targets/java_cert/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/java_keystore/aliases b/tests/integration/targets/java_keystore/aliases index b9305b0928..573cb189bf 100644 --- a/tests/integration/targets/java_keystore/aliases +++ b/tests/integration/targets/java_keystore/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/jboss/aliases b/tests/integration/targets/jboss/aliases index 23525810c4..38b6706fe1 100644 --- a/tests/integration/targets/jboss/aliases +++ b/tests/integration/targets/jboss/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/jira/aliases b/tests/integration/targets/jira/aliases index a58c201a4c..9c3dc5670a 100644 --- a/tests/integration/targets/jira/aliases +++ b/tests/integration/targets/jira/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 +azp/posix/3 unsupported -shippable/posix/group3 diff --git a/tests/integration/targets/kernel_blacklist/aliases b/tests/integration/targets/kernel_blacklist/aliases index abc0d5476d..afda346c4e 100644 --- a/tests/integration/targets/kernel_blacklist/aliases +++ b/tests/integration/targets/kernel_blacklist/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/launchd/aliases b/tests/integration/targets/launchd/aliases index 4507815d09..a350886969 100644 --- a/tests/integration/targets/launchd/aliases +++ b/tests/integration/targets/launchd/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/group1 +azp/posix/1 skip/freebsd skip/rhel diff --git a/tests/integration/targets/ldap_search/aliases b/tests/integration/targets/ldap_search/aliases index 76ff20c90e..7958445488 100644 --- a/tests/integration/targets/ldap_search/aliases +++ b/tests/integration/targets/ldap_search/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/listen_ports_facts/aliases b/tests/integration/targets/listen_ports_facts/aliases index 5e86d2a3f4..620afe071d 100644 --- a/tests/integration/targets/listen_ports_facts/aliases +++ b/tests/integration/targets/listen_ports_facts/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/osx diff --git a/tests/integration/targets/locale_gen/aliases b/tests/integration/targets/locale_gen/aliases index 5cbd0a392b..f7f4063f6c 100644 --- a/tests/integration/targets/locale_gen/aliases +++ b/tests/integration/targets/locale_gen/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 needs/root -shippable/posix/group3 skip/aix diff --git a/tests/integration/targets/lookup_cartesian/aliases b/tests/integration/targets/lookup_cartesian/aliases index 1ad3384c7e..2bdcc01132 100644 --- a/tests/integration/targets/lookup_cartesian/aliases +++ b/tests/integration/targets/lookup_cartesian/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/group1 +azp/posix/1 skip/aix skip/python2.6 # lookups are controller only, and we no longer support Python 2.6 on the controller diff --git a/tests/integration/targets/lookup_collection_version/aliases b/tests/integration/targets/lookup_collection_version/aliases index 7a0fc5c1ea..343f119da8 100644 --- a/tests/integration/targets/lookup_collection_version/aliases +++ b/tests/integration/targets/lookup_collection_version/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/lookup_dependent/aliases b/tests/integration/targets/lookup_dependent/aliases index fcbe73470c..26ad5c2449 100644 --- a/tests/integration/targets/lookup_dependent/aliases +++ b/tests/integration/targets/lookup_dependent/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 # lookups are controller only, and we no longer support Python 2.6 on the controller diff --git a/tests/integration/targets/lookup_dig/aliases b/tests/integration/targets/lookup_dig/aliases index 1def1a1485..eb449a9cfe 100644 --- a/tests/integration/targets/lookup_dig/aliases +++ b/tests/integration/targets/lookup_dig/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 # lookups are controller only, and we no longer support Python 2.6 on the controller diff --git a/tests/integration/targets/lookup_etcd3/aliases b/tests/integration/targets/lookup_etcd3/aliases index 9ec6614633..b9f3395f79 100644 --- a/tests/integration/targets/lookup_etcd3/aliases +++ b/tests/integration/targets/lookup_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 needs/file/tests/utils/constraints.txt needs/target/setup_etcd3 diff --git a/tests/integration/targets/lookup_flattened/aliases b/tests/integration/targets/lookup_flattened/aliases index 708d3bcd12..0ac9bad98a 100644 --- a/tests/integration/targets/lookup_flattened/aliases +++ b/tests/integration/targets/lookup_flattened/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/aix skip/python2.6 # lookups are controller only, and we no longer support Python 2.6 on the controller diff --git a/tests/integration/targets/lookup_lmdb_kv/aliases b/tests/integration/targets/lookup_lmdb_kv/aliases index 7c50594f42..66632fb4a9 100644 --- a/tests/integration/targets/lookup_lmdb_kv/aliases +++ b/tests/integration/targets/lookup_lmdb_kv/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/python2.6 # lookups are controller only, and we no longer support Python 2.6 on the controller diff --git a/tests/integration/targets/lookup_passwordstore/aliases b/tests/integration/targets/lookup_passwordstore/aliases index c9fb7e80db..0d4c5af3b2 100644 --- a/tests/integration/targets/lookup_passwordstore/aliases +++ b/tests/integration/targets/lookup_passwordstore/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/rhel diff --git a/tests/integration/targets/lookup_random_pet/aliases b/tests/integration/targets/lookup_random_pet/aliases index 708d3bcd12..0ac9bad98a 100644 --- a/tests/integration/targets/lookup_random_pet/aliases +++ b/tests/integration/targets/lookup_random_pet/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/aix skip/python2.6 # lookups are controller only, and we no longer support Python 2.6 on the controller diff --git a/tests/integration/targets/lookup_random_string/aliases b/tests/integration/targets/lookup_random_string/aliases index 708d3bcd12..0ac9bad98a 100644 --- a/tests/integration/targets/lookup_random_string/aliases +++ b/tests/integration/targets/lookup_random_string/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/aix skip/python2.6 # lookups are controller only, and we no longer support Python 2.6 on the controller diff --git a/tests/integration/targets/lookup_random_words/aliases b/tests/integration/targets/lookup_random_words/aliases index 708d3bcd12..0ac9bad98a 100644 --- a/tests/integration/targets/lookup_random_words/aliases +++ b/tests/integration/targets/lookup_random_words/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/aix skip/python2.6 # lookups are controller only, and we no longer support Python 2.6 on the controller diff --git a/tests/integration/targets/lvg/aliases b/tests/integration/targets/lvg/aliases index 01205a3972..f4617b3377 100644 --- a/tests/integration/targets/lvg/aliases +++ b/tests/integration/targets/lvg/aliases @@ -2,9 +2,9 @@ # 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 needs/privileged -shippable/posix/group1 skip/aix skip/freebsd skip/osx diff --git a/tests/integration/targets/mail/aliases b/tests/integration/targets/mail/aliases index abc0d5476d..afda346c4e 100644 --- a/tests/integration/targets/mail/aliases +++ b/tests/integration/targets/mail/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/module_helper/aliases b/tests/integration/targets/module_helper/aliases index be75e3ddab..12d1d6617e 100644 --- a/tests/integration/targets/module_helper/aliases +++ b/tests/integration/targets/module_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/group2 +azp/posix/2 diff --git a/tests/integration/targets/monit/aliases b/tests/integration/targets/monit/aliases index e60be5e504..2c2add2075 100644 --- a/tests/integration/targets/monit/aliases +++ b/tests/integration/targets/monit/aliases @@ -2,9 +2,9 @@ # 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 needs/target/setup_epel -shippable/posix/group2 skip/osx skip/macos skip/freebsd diff --git a/tests/integration/targets/mqtt/aliases b/tests/integration/targets/mqtt/aliases index 471b8e86f5..c25e0b6d55 100644 --- a/tests/integration/targets/mqtt/aliases +++ b/tests/integration/targets/mqtt/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/nomad/aliases b/tests/integration/targets/nomad/aliases index f9f52d7b84..ad2435c82c 100644 --- a/tests/integration/targets/nomad/aliases +++ b/tests/integration/targets/nomad/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 nomad_job_info destructive skip/aix diff --git a/tests/integration/targets/npm/aliases b/tests/integration/targets/npm/aliases index b1c4f2872e..6e2c65f386 100644 --- a/tests/integration/targets/npm/aliases +++ b/tests/integration/targets/npm/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/freebsd diff --git a/tests/integration/targets/odbc/aliases b/tests/integration/targets/odbc/aliases index 75f18e362c..2dbf0eac3e 100644 --- a/tests/integration/targets/odbc/aliases +++ b/tests/integration/targets/odbc/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/osx skip/macos skip/rhel8.0 diff --git a/tests/integration/targets/one_host/aliases b/tests/integration/targets/one_host/aliases index 7fba83598a..02a31bcd55 100644 --- a/tests/integration/targets/one_host/aliases +++ b/tests/integration/targets/one_host/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/generic/1 cloud/opennebula -shippable/cloud/group1 disabled # FIXME diff --git a/tests/integration/targets/one_template/aliases b/tests/integration/targets/one_template/aliases index 7fba83598a..02a31bcd55 100644 --- a/tests/integration/targets/one_template/aliases +++ b/tests/integration/targets/one_template/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/generic/1 cloud/opennebula -shippable/cloud/group1 disabled # FIXME diff --git a/tests/integration/targets/osx_defaults/aliases b/tests/integration/targets/osx_defaults/aliases index ee063facf6..bd478505d9 100644 --- a/tests/integration/targets/osx_defaults/aliases +++ b/tests/integration/targets/osx_defaults/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/rhel diff --git a/tests/integration/targets/pacman/aliases b/tests/integration/targets/pacman/aliases index 0262a240bb..1d25c01932 100644 --- a/tests/integration/targets/pacman/aliases +++ b/tests/integration/targets/pacman/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/freebsd skip/osx diff --git a/tests/integration/targets/pam_limits/aliases b/tests/integration/targets/pam_limits/aliases index 3cde3b1715..b85ae64190 100644 --- a/tests/integration/targets/pam_limits/aliases +++ b/tests/integration/targets/pam_limits/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/pamd/aliases b/tests/integration/targets/pamd/aliases index 3cde3b1715..b85ae64190 100644 --- a/tests/integration/targets/pamd/aliases +++ b/tests/integration/targets/pamd/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/pids/aliases b/tests/integration/targets/pids/aliases index 7a0fc5c1ea..343f119da8 100644 --- a/tests/integration/targets/pids/aliases +++ b/tests/integration/targets/pids/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/pipx/aliases b/tests/integration/targets/pipx/aliases index 0f370b3776..9f87ec3480 100644 --- a/tests/integration/targets/pipx/aliases +++ b/tests/integration/targets/pipx/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/2 destructive -shippable/posix/group2 skip/python2 skip/python3.5 diff --git a/tests/integration/targets/pipx_info/aliases b/tests/integration/targets/pipx_info/aliases index c42790aedf..a28278bbc1 100644 --- a/tests/integration/targets/pipx_info/aliases +++ b/tests/integration/targets/pipx_info/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 skip/python3.5 diff --git a/tests/integration/targets/pkgng/aliases b/tests/integration/targets/pkgng/aliases index 6972c2b6c8..e13fde32ce 100644 --- a/tests/integration/targets/pkgng/aliases +++ b/tests/integration/targets/pkgng/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/docker skip/osx diff --git a/tests/integration/targets/python_requirements_info/aliases b/tests/integration/targets/python_requirements_info/aliases index be75e3ddab..12d1d6617e 100644 --- a/tests/integration/targets/python_requirements_info/aliases +++ b/tests/integration/targets/python_requirements_info/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/read_csv/aliases b/tests/integration/targets/read_csv/aliases index be75e3ddab..12d1d6617e 100644 --- a/tests/integration/targets/read_csv/aliases +++ b/tests/integration/targets/read_csv/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/redis_info/aliases b/tests/integration/targets/redis_info/aliases index 8573c40daa..1f1c4baf77 100644 --- a/tests/integration/targets/redis_info/aliases +++ b/tests/integration/targets/redis_info/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/rundeck/aliases b/tests/integration/targets/rundeck/aliases index 0da9ab1822..3cf494c4c7 100644 --- a/tests/integration/targets/rundeck/aliases +++ b/tests/integration/targets/rundeck/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/sefcontext/aliases b/tests/integration/targets/sefcontext/aliases index 3a1d1f7e34..d318128f82 100644 --- a/tests/integration/targets/sefcontext/aliases +++ b/tests/integration/targets/sefcontext/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 needs/root -shippable/posix/group2 skip/aix diff --git a/tests/integration/targets/sensu_client/aliases b/tests/integration/targets/sensu_client/aliases index 225cabc08b..bca9905ba6 100644 --- a/tests/integration/targets/sensu_client/aliases +++ b/tests/integration/targets/sensu_client/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/root diff --git a/tests/integration/targets/sensu_handler/aliases b/tests/integration/targets/sensu_handler/aliases index 225cabc08b..bca9905ba6 100644 --- a/tests/integration/targets/sensu_handler/aliases +++ b/tests/integration/targets/sensu_handler/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/root diff --git a/tests/integration/targets/shutdown/aliases b/tests/integration/targets/shutdown/aliases index abc0d5476d..afda346c4e 100644 --- a/tests/integration/targets/shutdown/aliases +++ b/tests/integration/targets/shutdown/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/snap/aliases b/tests/integration/targets/snap/aliases index b8fcb9ee4a..dcb4aa199e 100644 --- a/tests/integration/targets/snap/aliases +++ b/tests/integration/targets/snap/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/snap_alias/aliases b/tests/integration/targets/snap_alias/aliases index b8fcb9ee4a..dcb4aa199e 100644 --- a/tests/integration/targets/snap_alias/aliases +++ b/tests/integration/targets/snap_alias/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/ssh_config/aliases b/tests/integration/targets/ssh_config/aliases index 6803185a41..6011128daa 100644 --- a/tests/integration/targets/ssh_config/aliases +++ b/tests/integration/targets/ssh_config/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 destructive -shippable/posix/group2 skip/python2.6 # stromssh only supports python3 skip/python2.7 # stromssh only supports python3 skip/freebsd # stromssh installation fails on freebsd diff --git a/tests/integration/targets/sudoers/aliases b/tests/integration/targets/sudoers/aliases index be75e3ddab..12d1d6617e 100644 --- a/tests/integration/targets/sudoers/aliases +++ b/tests/integration/targets/sudoers/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/supervisorctl/aliases b/tests/integration/targets/supervisorctl/aliases index 453d04cb3b..58524f1fb1 100644 --- a/tests/integration/targets/supervisorctl/aliases +++ b/tests/integration/targets/supervisorctl/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/2 destructive -shippable/posix/group2 skip/python3 skip/aix diff --git a/tests/integration/targets/sysrc/aliases b/tests/integration/targets/sysrc/aliases index 6972c2b6c8..e13fde32ce 100644 --- a/tests/integration/targets/sysrc/aliases +++ b/tests/integration/targets/sysrc/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/docker skip/osx diff --git a/tests/integration/targets/terraform/aliases b/tests/integration/targets/terraform/aliases index 1f9abfc0a2..1b6e4a26df 100644 --- a/tests/integration/targets/terraform/aliases +++ b/tests/integration/targets/terraform/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/windows skip/aix skip/osx diff --git a/tests/integration/targets/test_a_module/aliases b/tests/integration/targets/test_a_module/aliases index 7a0fc5c1ea..343f119da8 100644 --- a/tests/integration/targets/test_a_module/aliases +++ b/tests/integration/targets/test_a_module/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/timezone/aliases b/tests/integration/targets/timezone/aliases index 86d2291bb5..007bed5386 100644 --- a/tests/integration/targets/timezone/aliases +++ b/tests/integration/targets/timezone/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/ufw/aliases b/tests/integration/targets/ufw/aliases index ba9e581292..fa4f2a6cd3 100644 --- a/tests/integration/targets/ufw/aliases +++ b/tests/integration/targets/ufw/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/aix skip/osx skip/macos diff --git a/tests/integration/targets/wakeonlan/aliases b/tests/integration/targets/wakeonlan/aliases index 4ed7114b08..dadd9f37a2 100644 --- a/tests/integration/targets/wakeonlan/aliases +++ b/tests/integration/targets/wakeonlan/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/aix diff --git a/tests/integration/targets/xattr/aliases b/tests/integration/targets/xattr/aliases index 093fe91e51..db3751be49 100644 --- a/tests/integration/targets/xattr/aliases +++ b/tests/integration/targets/xattr/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/aix skip/docker skip/freebsd diff --git a/tests/integration/targets/xfs_quota/aliases b/tests/integration/targets/xfs_quota/aliases index 41006522bc..56dffecaa4 100644 --- a/tests/integration/targets/xfs_quota/aliases +++ b/tests/integration/targets/xfs_quota/aliases @@ -2,9 +2,9 @@ # 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 needs/privileged needs/root -shippable/posix/group1 skip/aix skip/osx skip/macos diff --git a/tests/integration/targets/xml/aliases b/tests/integration/targets/xml/aliases index 64596c2b12..0d1324b22a 100644 --- a/tests/integration/targets/xml/aliases +++ b/tests/integration/targets/xml/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/yarn/aliases b/tests/integration/targets/yarn/aliases index 323adc00f3..cb1bc115a0 100644 --- a/tests/integration/targets/yarn/aliases +++ b/tests/integration/targets/yarn/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/freebsd diff --git a/tests/integration/targets/yum_versionlock/aliases b/tests/integration/targets/yum_versionlock/aliases index 6bbff0fe26..ca3f7e796e 100644 --- a/tests/integration/targets/yum_versionlock/aliases +++ b/tests/integration/targets/yum_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/zypper/aliases b/tests/integration/targets/zypper/aliases index 58cfb98d53..e0a62a673c 100644 --- a/tests/integration/targets/zypper/aliases +++ b/tests/integration/targets/zypper/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/freebsd skip/osx diff --git a/tests/integration/targets/zypper_repository/aliases b/tests/integration/targets/zypper_repository/aliases index 58cfb98d53..e0a62a673c 100644 --- a/tests/integration/targets/zypper_repository/aliases +++ b/tests/integration/targets/zypper_repository/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/freebsd skip/osx diff --git a/tests/sanity/extra/aliases.py b/tests/sanity/extra/aliases.py index b5b6fe0538..8779fec513 100755 --- a/tests/sanity/extra/aliases.py +++ b/tests/sanity/extra/aliases.py @@ -20,13 +20,13 @@ def main(): with open('.azure-pipelines/azure-pipelines.yml', 'rb') as f: azp = yaml.safe_load(f) - allowed_targets = set(['shippable/cloud/group1']) + allowed_targets = set(['azp/generic/1']) for stage in azp['stages']: - if stage['stage'].startswith(('Sanity', 'Unit', 'Cloud', 'Summary')): + if stage['stage'].startswith(('Sanity', 'Unit', 'Generic', 'Summary')): continue for job in stage['jobs']: for group in job['parameters']['groups']: - allowed_targets.add('shippable/posix/group{0}'.format(group)) + allowed_targets.add('azp/posix/{0}'.format(group)) for path in paths: targets = [] diff --git a/tests/utils/shippable/cloud.sh b/tests/utils/shippable/generic.sh similarity index 90% rename from tests/utils/shippable/cloud.sh rename to tests/utils/shippable/generic.sh index a2e6ebf2be..5fd1fb55aa 100755 --- a/tests/utils/shippable/cloud.sh +++ b/tests/utils/shippable/generic.sh @@ -8,11 +8,10 @@ set -o pipefail -eux declare -a args IFS='/:' read -ra args <<< "$1" -cloud="${args[0]}" python="${args[1]}" group="${args[2]}" -target="shippable/${cloud}/group${group}/" +target="azp/generic/${group}/" stage="${S:-prod}" diff --git a/tests/utils/shippable/linux-community.sh b/tests/utils/shippable/linux-community.sh index 5adafa0cff..48d0d8687d 100755 --- a/tests/utils/shippable/linux-community.sh +++ b/tests/utils/shippable/linux-community.sh @@ -12,9 +12,9 @@ image="${args[1]}" python="${args[2]}" if [ "${#args[@]}" -gt 3 ]; then - target="shippable/posix/group${args[3]}/" + target="azp/posix/${args[3]}/" else - target="shippable/posix/" + target="azp/posix/" fi # shellcheck disable=SC2086 diff --git a/tests/utils/shippable/linux.sh b/tests/utils/shippable/linux.sh index ce3ac34df3..6e1e2350b9 100755 --- a/tests/utils/shippable/linux.sh +++ b/tests/utils/shippable/linux.sh @@ -11,9 +11,9 @@ IFS='/:' read -ra args <<< "$1" image="${args[1]}" if [ "${#args[@]}" -gt 2 ]; then - target="shippable/posix/group${args[2]}/" + target="azp/posix/${args[2]}/" else - target="shippable/posix/" + target="azp/posix/" fi # shellcheck disable=SC2086 diff --git a/tests/utils/shippable/remote.sh b/tests/utils/shippable/remote.sh index 725c199b90..84c1ebbe0e 100755 --- a/tests/utils/shippable/remote.sh +++ b/tests/utils/shippable/remote.sh @@ -12,9 +12,9 @@ platform="${args[0]}" version="${args[1]}" if [ "${#args[@]}" -gt 2 ]; then - target="shippable/posix/group${args[2]}/" + target="azp/posix/${args[2]}/" else - target="shippable/posix/" + target="azp/posix/" fi stage="${S:-prod}"