From ac606cd2bf760a0f0cd8e1d4b47ad6c0bd7ac52c Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Mon, 10 Oct 2022 22:39:27 +0200
Subject: [PATCH] Change CI group identifiers. (#484)

---
 .../targets/connection_docker/aliases         |  2 +-
 .../targets/connection_docker_api/aliases     |  2 +-
 .../targets/connection_nsenter/aliases        |  2 +-
 .../targets/docker_compose/aliases            |  2 +-
 .../integration/targets/docker_config/aliases |  2 +-
 .../targets/docker_container/aliases          |  2 +-
 .../targets/docker_container_exec/aliases     |  2 +-
 .../targets/docker_container_info/aliases     |  2 +-
 .../targets/docker_host_info/aliases          |  2 +-
 .../integration/targets/docker_image/aliases  |  2 +-
 .../targets/docker_image_info/aliases         |  2 +-
 .../targets/docker_image_load/aliases         |  2 +-
 .../integration/targets/docker_login/aliases  |  2 +-
 .../targets/docker_network/aliases            |  2 +-
 .../targets/docker_network_info/aliases       |  2 +-
 tests/integration/targets/docker_node/aliases |  2 +-
 .../targets/docker_node_info/aliases          |  2 +-
 .../integration/targets/docker_plugin/aliases |  2 +-
 .../integration/targets/docker_prune/aliases  |  2 +-
 .../integration/targets/docker_secret/aliases |  2 +-
 .../integration/targets/docker_stack/aliases  |  2 +-
 .../targets/docker_stack_info/aliases         |  2 +-
 .../targets/docker_stack_task_info/aliases    |  2 +-
 .../integration/targets/docker_swarm/aliases  |  2 +-
 .../targets/docker_swarm_info/aliases         |  2 +-
 .../targets/docker_swarm_service/aliases      |  2 +-
 .../targets/docker_swarm_service_info/aliases |  2 +-
 .../integration/targets/docker_volume/aliases |  2 +-
 .../targets/docker_volume_info/aliases        |  2 +-
 .../targets/generic_connection_tests/aliases  |  2 +-
 .../targets/generic_ssh_connection/aliases    |  2 +-
 .../inventory_docker_containers/aliases       |  2 +-
 .../targets/inventory_docker_machine/aliases  |  2 +-
 .../targets/inventory_docker_swarm/aliases    |  2 +-
 tests/utils/shippable/cloud.sh                | 22 -------------------
 tests/utils/shippable/linux-community.sh      |  4 ++--
 tests/utils/shippable/linux.sh                |  4 ++--
 tests/utils/shippable/remote.sh               |  4 ++--
 38 files changed, 40 insertions(+), 62 deletions(-)
 delete mode 100755 tests/utils/shippable/cloud.sh

diff --git a/tests/integration/targets/connection_docker/aliases b/tests/integration/targets/connection_docker/aliases
index 648248af..40eff16f 100644
--- a/tests/integration/targets/connection_docker/aliases
+++ b/tests/integration/targets/connection_docker/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/group4
+azp/4
 skip/docker  # coverage does not work if we're inside a docker container, since we cannot access this container's /tmp dir from the new container
 destructive
diff --git a/tests/integration/targets/connection_docker_api/aliases b/tests/integration/targets/connection_docker_api/aliases
index 648248af..40eff16f 100644
--- a/tests/integration/targets/connection_docker_api/aliases
+++ b/tests/integration/targets/connection_docker_api/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/group4
+azp/4
 skip/docker  # coverage does not work if we're inside a docker container, since we cannot access this container's /tmp dir from the new container
 destructive
diff --git a/tests/integration/targets/connection_nsenter/aliases b/tests/integration/targets/connection_nsenter/aliases
index 66434a70..40067d9d 100644
--- a/tests/integration/targets/connection_nsenter/aliases
+++ b/tests/integration/targets/connection_nsenter/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/group5
+azp/5
 skip/docker  # this requires unfettered access to the container host
 skip/rhel7.9  # nsenter does not work out of the box
 destructive
diff --git a/tests/integration/targets/docker_compose/aliases b/tests/integration/targets/docker_compose/aliases
index 9683a6a5..2e1acc0a 100644
--- a/tests/integration/targets/docker_compose/aliases
+++ b/tests/integration/targets/docker_compose/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/group4
+azp/4
 destructive
diff --git a/tests/integration/targets/docker_config/aliases b/tests/integration/targets/docker_config/aliases
index b84dff7e..fc581d54 100644
--- a/tests/integration/targets/docker_config/aliases
+++ b/tests/integration/targets/docker_config/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/3
 destructive
diff --git a/tests/integration/targets/docker_container/aliases b/tests/integration/targets/docker_container/aliases
index e7bdbdc2..0837c740 100644
--- a/tests/integration/targets/docker_container/aliases
+++ b/tests/integration/targets/docker_container/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/group5
+azp/5
 destructive
diff --git a/tests/integration/targets/docker_container_exec/aliases b/tests/integration/targets/docker_container_exec/aliases
index 9683a6a5..2e1acc0a 100644
--- a/tests/integration/targets/docker_container_exec/aliases
+++ b/tests/integration/targets/docker_container_exec/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/group4
+azp/4
 destructive
diff --git a/tests/integration/targets/docker_container_info/aliases b/tests/integration/targets/docker_container_info/aliases
index e7bdbdc2..0837c740 100644
--- a/tests/integration/targets/docker_container_info/aliases
+++ b/tests/integration/targets/docker_container_info/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/group5
+azp/5
 destructive
diff --git a/tests/integration/targets/docker_host_info/aliases b/tests/integration/targets/docker_host_info/aliases
index 9683a6a5..2e1acc0a 100644
--- a/tests/integration/targets/docker_host_info/aliases
+++ b/tests/integration/targets/docker_host_info/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/group4
+azp/4
 destructive
diff --git a/tests/integration/targets/docker_image/aliases b/tests/integration/targets/docker_image/aliases
index 9683a6a5..2e1acc0a 100644
--- a/tests/integration/targets/docker_image/aliases
+++ b/tests/integration/targets/docker_image/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/group4
+azp/4
 destructive
diff --git a/tests/integration/targets/docker_image_info/aliases b/tests/integration/targets/docker_image_info/aliases
index 9683a6a5..2e1acc0a 100644
--- a/tests/integration/targets/docker_image_info/aliases
+++ b/tests/integration/targets/docker_image_info/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/group4
+azp/4
 destructive
diff --git a/tests/integration/targets/docker_image_load/aliases b/tests/integration/targets/docker_image_load/aliases
index 9683a6a5..2e1acc0a 100644
--- a/tests/integration/targets/docker_image_load/aliases
+++ b/tests/integration/targets/docker_image_load/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/group4
+azp/4
 destructive
diff --git a/tests/integration/targets/docker_login/aliases b/tests/integration/targets/docker_login/aliases
index 9683a6a5..2e1acc0a 100644
--- a/tests/integration/targets/docker_login/aliases
+++ b/tests/integration/targets/docker_login/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/group4
+azp/4
 destructive
diff --git a/tests/integration/targets/docker_network/aliases b/tests/integration/targets/docker_network/aliases
index 9683a6a5..2e1acc0a 100644
--- a/tests/integration/targets/docker_network/aliases
+++ b/tests/integration/targets/docker_network/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/group4
+azp/4
 destructive
diff --git a/tests/integration/targets/docker_network_info/aliases b/tests/integration/targets/docker_network_info/aliases
index 9683a6a5..2e1acc0a 100644
--- a/tests/integration/targets/docker_network_info/aliases
+++ b/tests/integration/targets/docker_network_info/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/group4
+azp/4
 destructive
diff --git a/tests/integration/targets/docker_node/aliases b/tests/integration/targets/docker_node/aliases
index e0f02170..50e0e5f3 100644
--- a/tests/integration/targets/docker_node/aliases
+++ b/tests/integration/targets/docker_node/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/2
 destructive
 needs/root
diff --git a/tests/integration/targets/docker_node_info/aliases b/tests/integration/targets/docker_node_info/aliases
index bbb6ea09..9eec55e3 100644
--- a/tests/integration/targets/docker_node_info/aliases
+++ b/tests/integration/targets/docker_node_info/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/2
 destructive
diff --git a/tests/integration/targets/docker_plugin/aliases b/tests/integration/targets/docker_plugin/aliases
index 9683a6a5..2e1acc0a 100644
--- a/tests/integration/targets/docker_plugin/aliases
+++ b/tests/integration/targets/docker_plugin/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/group4
+azp/4
 destructive
diff --git a/tests/integration/targets/docker_prune/aliases b/tests/integration/targets/docker_prune/aliases
index 9683a6a5..2e1acc0a 100644
--- a/tests/integration/targets/docker_prune/aliases
+++ b/tests/integration/targets/docker_prune/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/group4
+azp/4
 destructive
diff --git a/tests/integration/targets/docker_secret/aliases b/tests/integration/targets/docker_secret/aliases
index b84dff7e..fc581d54 100644
--- a/tests/integration/targets/docker_secret/aliases
+++ b/tests/integration/targets/docker_secret/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/3
 destructive
diff --git a/tests/integration/targets/docker_stack/aliases b/tests/integration/targets/docker_stack/aliases
index bbb6ea09..9eec55e3 100644
--- a/tests/integration/targets/docker_stack/aliases
+++ b/tests/integration/targets/docker_stack/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/2
 destructive
diff --git a/tests/integration/targets/docker_stack_info/aliases b/tests/integration/targets/docker_stack_info/aliases
index bbb6ea09..9eec55e3 100644
--- a/tests/integration/targets/docker_stack_info/aliases
+++ b/tests/integration/targets/docker_stack_info/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/2
 destructive
diff --git a/tests/integration/targets/docker_stack_task_info/aliases b/tests/integration/targets/docker_stack_task_info/aliases
index bbb6ea09..9eec55e3 100644
--- a/tests/integration/targets/docker_stack_task_info/aliases
+++ b/tests/integration/targets/docker_stack_task_info/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/2
 destructive
diff --git a/tests/integration/targets/docker_swarm/aliases b/tests/integration/targets/docker_swarm/aliases
index 57dc7bbe..19c65551 100644
--- a/tests/integration/targets/docker_swarm/aliases
+++ b/tests/integration/targets/docker_swarm/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/1
 destructive
 needs/root
diff --git a/tests/integration/targets/docker_swarm_info/aliases b/tests/integration/targets/docker_swarm_info/aliases
index 34334fd8..6f61c620 100644
--- a/tests/integration/targets/docker_swarm_info/aliases
+++ b/tests/integration/targets/docker_swarm_info/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/1
 destructive
diff --git a/tests/integration/targets/docker_swarm_service/aliases b/tests/integration/targets/docker_swarm_service/aliases
index b84dff7e..fc581d54 100644
--- a/tests/integration/targets/docker_swarm_service/aliases
+++ b/tests/integration/targets/docker_swarm_service/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/3
 destructive
diff --git a/tests/integration/targets/docker_swarm_service_info/aliases b/tests/integration/targets/docker_swarm_service_info/aliases
index b84dff7e..fc581d54 100644
--- a/tests/integration/targets/docker_swarm_service_info/aliases
+++ b/tests/integration/targets/docker_swarm_service_info/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/3
 destructive
diff --git a/tests/integration/targets/docker_volume/aliases b/tests/integration/targets/docker_volume/aliases
index 9683a6a5..2e1acc0a 100644
--- a/tests/integration/targets/docker_volume/aliases
+++ b/tests/integration/targets/docker_volume/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/group4
+azp/4
 destructive
diff --git a/tests/integration/targets/docker_volume_info/aliases b/tests/integration/targets/docker_volume_info/aliases
index 9683a6a5..2e1acc0a 100644
--- a/tests/integration/targets/docker_volume_info/aliases
+++ b/tests/integration/targets/docker_volume_info/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/group4
+azp/4
 destructive
diff --git a/tests/integration/targets/generic_connection_tests/aliases b/tests/integration/targets/generic_connection_tests/aliases
index 9683a6a5..2e1acc0a 100644
--- a/tests/integration/targets/generic_connection_tests/aliases
+++ b/tests/integration/targets/generic_connection_tests/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/group4
+azp/4
 destructive
diff --git a/tests/integration/targets/generic_ssh_connection/aliases b/tests/integration/targets/generic_ssh_connection/aliases
index 9bb86f89..b9808536 100644
--- a/tests/integration/targets/generic_ssh_connection/aliases
+++ b/tests/integration/targets/generic_ssh_connection/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/group4
+azp/4
 destructive
 needs/root
 skip/docker  # we need a VM, and not a container
diff --git a/tests/integration/targets/inventory_docker_containers/aliases b/tests/integration/targets/inventory_docker_containers/aliases
index 71a4112c..1485e0b2 100644
--- a/tests/integration/targets/inventory_docker_containers/aliases
+++ b/tests/integration/targets/inventory_docker_containers/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/group4
+azp/4
 destructive
 needs/root
diff --git a/tests/integration/targets/inventory_docker_machine/aliases b/tests/integration/targets/inventory_docker_machine/aliases
index e2ad87f1..956df459 100644
--- a/tests/integration/targets/inventory_docker_machine/aliases
+++ b/tests/integration/targets/inventory_docker_machine/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/2
 disabled
-shippable/posix/group2
 destructive
 needs/root
diff --git a/tests/integration/targets/inventory_docker_swarm/aliases b/tests/integration/targets/inventory_docker_swarm/aliases
index e0f02170..50e0e5f3 100644
--- a/tests/integration/targets/inventory_docker_swarm/aliases
+++ b/tests/integration/targets/inventory_docker_swarm/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/2
 destructive
 needs/root
diff --git a/tests/utils/shippable/cloud.sh b/tests/utils/shippable/cloud.sh
deleted file mode 100755
index a2e6ebf2..00000000
--- a/tests/utils/shippable/cloud.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (c) Ansible Project
-# 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
-
-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}/"
-
-stage="${S:-prod}"
-
-# shellcheck disable=SC2086
-ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \
-    --remote-terminate always --remote-stage "${stage}" \
-    --docker --python "${python}"
diff --git a/tests/utils/shippable/linux-community.sh b/tests/utils/shippable/linux-community.sh
index 5adafa0c..78dc10a7 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/${args[3]}/"
 else
-    target="shippable/posix/"
+    target="azp/"
 fi
 
 # shellcheck disable=SC2086
diff --git a/tests/utils/shippable/linux.sh b/tests/utils/shippable/linux.sh
index ce3ac34d..9a5381f8 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/${args[2]}/"
 else
-    target="shippable/posix/"
+    target="azp/"
 fi
 
 # shellcheck disable=SC2086
diff --git a/tests/utils/shippable/remote.sh b/tests/utils/shippable/remote.sh
index 41093942..f630a644 100755
--- a/tests/utils/shippable/remote.sh
+++ b/tests/utils/shippable/remote.sh
@@ -13,9 +13,9 @@ version="${args[1]}"
 target="shippable/posix/"
 
 if [ "${#args[@]}" -gt 2 ]; then
-    target="shippable/posix/group${args[2]}/"
+    target="azp/${args[2]}/"
 else
-    target="shippable/posix/"
+    target="azp/"
 fi
 
 force_python=""