Change CI group identifiers (#517)

* Change CI group identifiers.

* cloud → generic.

tests/integration/targets/acme_account/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
 
-shippable/cloud/group1
-shippable/posix/group1
+azp/generic/1
+azp/posix/1
 cloud/acme
 
 # Skip all VMs, since we cannot talk to the ACME simulator from these:

tests/integration/targets/acme_account_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
 
-shippable/cloud/group1
-shippable/posix/group1
+azp/generic/1
+azp/posix/1
 cloud/acme
 
 # Skip all VMs, since we cannot talk to the ACME simulator from these:

tests/integration/targets/acme_certificate/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
 
-shippable/cloud/group1
-shippable/posix/group1
+azp/generic/1
+azp/posix/1
 cloud/acme
 
 # Skip all VMs, since we cannot talk to the ACME simulator from these:

tests/integration/targets/acme_certificate_revoke/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
 
-shippable/cloud/group1
-shippable/posix/group1
+azp/generic/1
+azp/posix/1
 cloud/acme
 
 # Skip all VMs, since we cannot talk to the ACME simulator from these:

tests/integration/targets/acme_challenge_cert_helper/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
 
-shippable/cloud/group1
-shippable/posix/group1
+azp/generic/1
+azp/posix/1
 cloud/acme
 
 # Skip all VMs, since we cannot talk to the ACME simulator from these:

tests/integration/targets/acme_inspect/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
 
-shippable/cloud/group1
-shippable/posix/group1
+azp/generic/1
+azp/posix/1
 cloud/acme
 
 # Skip all VMs, since we cannot talk to the ACME simulator from these:

tests/integration/targets/certificate_complete_chain/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/cloud/group1
-shippable/posix/group1
+azp/generic/1
+azp/posix/1

tests/integration/targets/crypto_info/aliases

@@ -3,6 +3,6 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 context/controller
-shippable/cloud/group1
-shippable/posix/group1
+azp/generic/1
+azp/posix/1
 destructive

tests/integration/targets/get_certificate/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/cloud/group1
-shippable/posix/group1
+azp/generic/1
+azp/posix/1
 destructive
 needs/httptester

tests/integration/targets/luks_device/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/osx
 skip/macos
 skip/freebsd

tests/integration/targets/openssh_cert/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
 destructive

tests/integration/targets/openssh_keypair/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
 destructive

tests/integration/targets/openssl_csr/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/cloud/group1
-shippable/posix/group1
+azp/generic/1
+azp/posix/1
 destructive

tests/integration/targets/openssl_csr_info/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/cloud/group1
-shippable/posix/group1
+azp/generic/1
+azp/posix/1
 destructive

tests/integration/targets/openssl_csr_pipe/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/cloud/group1
-shippable/posix/group1
+azp/generic/1
+azp/posix/1
 destructive

tests/integration/targets/openssl_dhparam/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/cloud/group1
-shippable/posix/group1
+azp/generic/1
+azp/posix/1
 destructive

tests/integration/targets/openssl_pkcs12/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/cloud/group1
-shippable/posix/group1
+azp/generic/1
+azp/posix/1
 destructive

tests/integration/targets/openssl_privatekey/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/cloud/group1
-shippable/posix/group1
+azp/generic/1
+azp/posix/1
 destructive

tests/integration/targets/openssl_privatekey_convert/aliases

@@ -3,6 +3,6 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 context/controller
-shippable/cloud/group1
-shippable/posix/group1
+azp/generic/1
+azp/posix/1
 destructive

tests/integration/targets/openssl_privatekey_info/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/cloud/group1
-shippable/posix/group1
+azp/generic/1
+azp/posix/1
 destructive

tests/integration/targets/openssl_privatekey_pipe/aliases

@@ -3,6 +3,6 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 context/controller
-shippable/cloud/group1
-shippable/posix/group1
+azp/generic/1
+azp/posix/1
 destructive

tests/integration/targets/openssl_publickey/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/cloud/group1
-shippable/posix/group1
+azp/generic/1
+azp/posix/1
 destructive

tests/integration/targets/openssl_publickey_info/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/cloud/group1
-shippable/posix/group1
+azp/generic/1
+azp/posix/1
 destructive

tests/integration/targets/openssl_signature/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/cloud/group1
-shippable/posix/group1
+azp/generic/1
+azp/posix/1
 openssl_signature_info
 destructive

tests/integration/targets/x509_certificate-acme/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
 
-shippable/cloud/group1
-shippable/posix/group1
+azp/generic/1
+azp/posix/1
 cloud/acme
 
 # Skip all VMs, since we cannot talk to the ACME simulator from these:

tests/integration/targets/x509_certificate/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/cloud/group1
-shippable/posix/group1
+azp/generic/1
+azp/posix/1
 destructive

tests/integration/targets/x509_certificate_info/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/cloud/group1
-shippable/posix/group1
+azp/generic/1
+azp/posix/1
 destructive

tests/integration/targets/x509_certificate_pipe/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/cloud/group1
-shippable/posix/group1
+azp/generic/1
+azp/posix/1
 destructive

tests/integration/targets/x509_crl/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/cloud/group1
-shippable/posix/group1
+azp/generic/1
+azp/posix/1
 x509_crl_info
 destructive

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}"
 

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

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

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}"