diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index b1b90b08..e5b1ac78 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -334,15 +334,15 @@ stages: targets: - name: 'RHEL 7.8' test: 'rhel/7.8' -### 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.5 @@ -352,65 +352,65 @@ stages: - test: 3.9 - test: "3.10" - 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.9 - - 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.8 - - 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: 2.6 - test: 3.9 - - 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: 3.8 - - stage: Cloud_2_10 - displayName: Cloud 2.10 + - stage: Generic_2_10 + displayName: Generic 2.10 dependsOn: [] jobs: - template: templates/matrix.yml parameters: nameFormat: Python {0} - testFormat: 2.10/cloud/{0}/1 + testFormat: 2.10/generic/{0}/1 targets: - test: 3.6 - - stage: Cloud_2_9 - displayName: Cloud 2.9 + - stage: Generic_2_9 + displayName: Generic 2.9 dependsOn: [] jobs: - template: templates/matrix.yml parameters: nameFormat: Python {0} - testFormat: 2.9/cloud/{0}/1 + testFormat: 2.9/generic/{0}/1 targets: - test: 2.7 @@ -441,12 +441,12 @@ stages: - Docker_2_10 - Docker_2_9 - Docker_community_devel - - Cloud_devel - - Cloud_2_14 - - Cloud_2_13 - - Cloud_2_12 - - Cloud_2_11 - - Cloud_2_10 - - Cloud_2_9 + - Generic_devel + - Generic_2_14 + - Generic_2_13 + - Generic_2_12 + - Generic_2_11 + - Generic_2_10 + - Generic_2_9 jobs: - template: templates/coverage.yml diff --git a/tests/integration/targets/acme_account/aliases b/tests/integration/targets/acme_account/aliases index be05491b..07bd8ec6 100644 --- a/tests/integration/targets/acme_account/aliases +++ b/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: diff --git a/tests/integration/targets/acme_account_info/aliases b/tests/integration/targets/acme_account_info/aliases index be05491b..07bd8ec6 100644 --- a/tests/integration/targets/acme_account_info/aliases +++ b/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: diff --git a/tests/integration/targets/acme_certificate/aliases b/tests/integration/targets/acme_certificate/aliases index be05491b..07bd8ec6 100644 --- a/tests/integration/targets/acme_certificate/aliases +++ b/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: diff --git a/tests/integration/targets/acme_certificate_revoke/aliases b/tests/integration/targets/acme_certificate_revoke/aliases index be05491b..07bd8ec6 100644 --- a/tests/integration/targets/acme_certificate_revoke/aliases +++ b/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: diff --git a/tests/integration/targets/acme_challenge_cert_helper/aliases b/tests/integration/targets/acme_challenge_cert_helper/aliases index be05491b..07bd8ec6 100644 --- a/tests/integration/targets/acme_challenge_cert_helper/aliases +++ b/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: diff --git a/tests/integration/targets/acme_inspect/aliases b/tests/integration/targets/acme_inspect/aliases index be05491b..07bd8ec6 100644 --- a/tests/integration/targets/acme_inspect/aliases +++ b/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: diff --git a/tests/integration/targets/certificate_complete_chain/aliases b/tests/integration/targets/certificate_complete_chain/aliases index 6133c091..af144115 100644 --- a/tests/integration/targets/certificate_complete_chain/aliases +++ b/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 diff --git a/tests/integration/targets/crypto_info/aliases b/tests/integration/targets/crypto_info/aliases index 086b123f..768a4b6e 100644 --- a/tests/integration/targets/crypto_info/aliases +++ b/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 diff --git a/tests/integration/targets/get_certificate/aliases b/tests/integration/targets/get_certificate/aliases index 4ed4cf3b..04be15da 100644 --- a/tests/integration/targets/get_certificate/aliases +++ b/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 diff --git a/tests/integration/targets/luks_device/aliases b/tests/integration/targets/luks_device/aliases index 47e095a4..5fedfbfb 100644 --- a/tests/integration/targets/luks_device/aliases +++ b/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 diff --git a/tests/integration/targets/openssh_cert/aliases b/tests/integration/targets/openssh_cert/aliases index 34334fd8..428e8289 100644 --- a/tests/integration/targets/openssh_cert/aliases +++ b/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 diff --git a/tests/integration/targets/openssh_keypair/aliases b/tests/integration/targets/openssh_keypair/aliases index 34334fd8..428e8289 100644 --- a/tests/integration/targets/openssh_keypair/aliases +++ b/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 diff --git a/tests/integration/targets/openssl_csr/aliases b/tests/integration/targets/openssl_csr/aliases index a0ad2e44..3d7d391b 100644 --- a/tests/integration/targets/openssl_csr/aliases +++ b/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 diff --git a/tests/integration/targets/openssl_csr_info/aliases b/tests/integration/targets/openssl_csr_info/aliases index a0ad2e44..3d7d391b 100644 --- a/tests/integration/targets/openssl_csr_info/aliases +++ b/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 diff --git a/tests/integration/targets/openssl_csr_pipe/aliases b/tests/integration/targets/openssl_csr_pipe/aliases index a0ad2e44..3d7d391b 100644 --- a/tests/integration/targets/openssl_csr_pipe/aliases +++ b/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 diff --git a/tests/integration/targets/openssl_dhparam/aliases b/tests/integration/targets/openssl_dhparam/aliases index a0ad2e44..3d7d391b 100644 --- a/tests/integration/targets/openssl_dhparam/aliases +++ b/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 diff --git a/tests/integration/targets/openssl_pkcs12/aliases b/tests/integration/targets/openssl_pkcs12/aliases index a0ad2e44..3d7d391b 100644 --- a/tests/integration/targets/openssl_pkcs12/aliases +++ b/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 diff --git a/tests/integration/targets/openssl_privatekey/aliases b/tests/integration/targets/openssl_privatekey/aliases index a0ad2e44..3d7d391b 100644 --- a/tests/integration/targets/openssl_privatekey/aliases +++ b/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 diff --git a/tests/integration/targets/openssl_privatekey_convert/aliases b/tests/integration/targets/openssl_privatekey_convert/aliases index 086b123f..768a4b6e 100644 --- a/tests/integration/targets/openssl_privatekey_convert/aliases +++ b/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 diff --git a/tests/integration/targets/openssl_privatekey_info/aliases b/tests/integration/targets/openssl_privatekey_info/aliases index a0ad2e44..3d7d391b 100644 --- a/tests/integration/targets/openssl_privatekey_info/aliases +++ b/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 diff --git a/tests/integration/targets/openssl_privatekey_pipe/aliases b/tests/integration/targets/openssl_privatekey_pipe/aliases index 086b123f..768a4b6e 100644 --- a/tests/integration/targets/openssl_privatekey_pipe/aliases +++ b/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 diff --git a/tests/integration/targets/openssl_publickey/aliases b/tests/integration/targets/openssl_publickey/aliases index a0ad2e44..3d7d391b 100644 --- a/tests/integration/targets/openssl_publickey/aliases +++ b/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 diff --git a/tests/integration/targets/openssl_publickey_info/aliases b/tests/integration/targets/openssl_publickey_info/aliases index a0ad2e44..3d7d391b 100644 --- a/tests/integration/targets/openssl_publickey_info/aliases +++ b/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 diff --git a/tests/integration/targets/openssl_signature/aliases b/tests/integration/targets/openssl_signature/aliases index b7154119..409400b6 100644 --- a/tests/integration/targets/openssl_signature/aliases +++ b/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 diff --git a/tests/integration/targets/x509_certificate-acme/aliases b/tests/integration/targets/x509_certificate-acme/aliases index be05491b..07bd8ec6 100644 --- a/tests/integration/targets/x509_certificate-acme/aliases +++ b/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: diff --git a/tests/integration/targets/x509_certificate/aliases b/tests/integration/targets/x509_certificate/aliases index a0ad2e44..3d7d391b 100644 --- a/tests/integration/targets/x509_certificate/aliases +++ b/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 diff --git a/tests/integration/targets/x509_certificate_info/aliases b/tests/integration/targets/x509_certificate_info/aliases index a0ad2e44..3d7d391b 100644 --- a/tests/integration/targets/x509_certificate_info/aliases +++ b/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 diff --git a/tests/integration/targets/x509_certificate_pipe/aliases b/tests/integration/targets/x509_certificate_pipe/aliases index a0ad2e44..3d7d391b 100644 --- a/tests/integration/targets/x509_certificate_pipe/aliases +++ b/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 diff --git a/tests/integration/targets/x509_crl/aliases b/tests/integration/targets/x509_crl/aliases index 139bab7f..86aba2e1 100644 --- a/tests/integration/targets/x509_crl/aliases +++ b/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 diff --git a/tests/utils/shippable/cloud.sh b/tests/utils/shippable/generic.sh similarity index 91% rename from tests/utils/shippable/cloud.sh rename to tests/utils/shippable/generic.sh index 9276f48d..34532791 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 5adafa0c..48d0d868 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 ce3ac34d..6e1e2350 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 358fc318..43fbb444 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}"