Expand Shippable test matrix. (#66912)

* Add 2 CI groups for AWS.
* Add 1 CI group for vmware.
* Add 1 CI group for CS.
* Add 1 CI group for posix.

110 files changed, 110 insertions, 110 deletions

diff --git a/test/integration/targets/apt/aliases b/test/integration/targets/apt/aliases
index 6b34357ded..a0c51ac1dd 100644
--- a/test/integration/targets/apt/aliases
+++ b/test/integration/targets/apt/aliases
@@ -1,4 +1,4 @@
-shippable/posix/group1
+shippable/posix/group5
 destructive
 skip/freebsd
 skip/osx
diff --git a/test/integration/targets/async_extra_data/aliases b/test/integration/targets/async_extra_data/aliases
index b59832142f..70a7b7a9f3 100644
--- a/test/integration/targets/async_extra_data/aliases
+++ b/test/integration/targets/async_extra_data/aliases
@@ -1 +1 @@
-shippable/posix/group3
+shippable/posix/group5
diff --git a/test/integration/targets/aws_s3/aliases b/test/integration/targets/aws_s3/aliases
index a112c3d1bb..72a9fb4f57 100644
--- a/test/integration/targets/aws_s3/aliases
+++ b/test/integration/targets/aws_s3/aliases
@@ -1,2 +1,2 @@
 cloud/aws
-shippable/aws/group1
+shippable/aws/group4
diff --git a/test/integration/targets/aws_ssm_parameters/aliases b/test/integration/targets/aws_ssm_parameters/aliases
index 6e3860bee2..72a9fb4f57 100644
--- a/test/integration/targets/aws_ssm_parameters/aliases
+++ b/test/integration/targets/aws_ssm_parameters/aliases
@@ -1,2 +1,2 @@
 cloud/aws
-shippable/aws/group2
+shippable/aws/group4
diff --git a/test/integration/targets/connection_aws_ssm/aliases b/test/integration/targets/connection_aws_ssm/aliases
index 96a01dcfbe..995f416291 100644
--- a/test/integration/targets/connection_aws_ssm/aliases
+++ b/test/integration/targets/connection_aws_ssm/aliases
@@ -1,6 +1,6 @@
 cloud/aws
 destructive
-shippable/aws/group1
+shippable/aws/group4
 non_local
 needs/root
 needs/target/connection
diff --git a/test/integration/targets/cs_portforward/aliases b/test/integration/targets/cs_portforward/aliases
index c89c86d7d2..a315c1b58b 100644
--- a/test/integration/targets/cs_portforward/aliases
+++ b/test/integration/targets/cs_portforward/aliases
@@ -1,2 +1,2 @@
 cloud/cs
-shippable/cs/group1
+shippable/cs/group2
diff --git a/test/integration/targets/cs_project/aliases b/test/integration/targets/cs_project/aliases
index c89c86d7d2..a315c1b58b 100644
--- a/test/integration/targets/cs_project/aliases
+++ b/test/integration/targets/cs_project/aliases
@@ -1,2 +1,2 @@
 cloud/cs
-shippable/cs/group1
+shippable/cs/group2
diff --git a/test/integration/targets/cs_region/aliases b/test/integration/targets/cs_region/aliases
index c89c86d7d2..a315c1b58b 100644
--- a/test/integration/targets/cs_region/aliases
+++ b/test/integration/targets/cs_region/aliases
@@ -1,2 +1,2 @@
 cloud/cs
-shippable/cs/group1
+shippable/cs/group2
diff --git a/test/integration/targets/cs_resourcelimit/aliases b/test/integration/targets/cs_resourcelimit/aliases
index c89c86d7d2..a315c1b58b 100644
--- a/test/integration/targets/cs_resourcelimit/aliases
+++ b/test/integration/targets/cs_resourcelimit/aliases
@@ -1,2 +1,2 @@
 cloud/cs
-shippable/cs/group1
+shippable/cs/group2
diff --git a/test/integration/targets/cs_role/aliases b/test/integration/targets/cs_role/aliases
index c89c86d7d2..a315c1b58b 100644
--- a/test/integration/targets/cs_role/aliases
+++ b/test/integration/targets/cs_role/aliases
@@ -1,2 +1,2 @@
 cloud/cs
-shippable/cs/group1
+shippable/cs/group2
diff --git a/test/integration/targets/cs_role_permission/aliases b/test/integration/targets/cs_role_permission/aliases
index c89c86d7d2..a315c1b58b 100644
--- a/test/integration/targets/cs_role_permission/aliases
+++ b/test/integration/targets/cs_role_permission/aliases
@@ -1,2 +1,2 @@
 cloud/cs
-shippable/cs/group1
+shippable/cs/group2
diff --git a/test/integration/targets/cs_router/aliases b/test/integration/targets/cs_router/aliases
index c89c86d7d2..a315c1b58b 100644
--- a/test/integration/targets/cs_router/aliases
+++ b/test/integration/targets/cs_router/aliases
@@ -1,2 +1,2 @@
 cloud/cs
-shippable/cs/group1
+shippable/cs/group2
diff --git a/test/integration/targets/cs_securitygroup/aliases b/test/integration/targets/cs_securitygroup/aliases
index c89c86d7d2..a315c1b58b 100644
--- a/test/integration/targets/cs_securitygroup/aliases
+++ b/test/integration/targets/cs_securitygroup/aliases
@@ -1,2 +1,2 @@
 cloud/cs
-shippable/cs/group1
+shippable/cs/group2
diff --git a/test/integration/targets/cs_securitygroup_rule/aliases b/test/integration/targets/cs_securitygroup_rule/aliases
index c89c86d7d2..a315c1b58b 100644
--- a/test/integration/targets/cs_securitygroup_rule/aliases
+++ b/test/integration/targets/cs_securitygroup_rule/aliases
@@ -1,2 +1,2 @@
 cloud/cs
-shippable/cs/group1
+shippable/cs/group2
diff --git a/test/integration/targets/cs_service_offering/aliases b/test/integration/targets/cs_service_offering/aliases
index c89c86d7d2..a315c1b58b 100644
--- a/test/integration/targets/cs_service_offering/aliases
+++ b/test/integration/targets/cs_service_offering/aliases
@@ -1,2 +1,2 @@
 cloud/cs
-shippable/cs/group1
+shippable/cs/group2
diff --git a/test/integration/targets/cs_snapshot_policy/aliases b/test/integration/targets/cs_snapshot_policy/aliases
index c89c86d7d2..a315c1b58b 100644
--- a/test/integration/targets/cs_snapshot_policy/aliases
+++ b/test/integration/targets/cs_snapshot_policy/aliases
@@ -1,2 +1,2 @@
 cloud/cs
-shippable/cs/group1
+shippable/cs/group2
diff --git a/test/integration/targets/cs_sshkeypair/aliases b/test/integration/targets/cs_sshkeypair/aliases
index c89c86d7d2..a315c1b58b 100644
--- a/test/integration/targets/cs_sshkeypair/aliases
+++ b/test/integration/targets/cs_sshkeypair/aliases
@@ -1,2 +1,2 @@
 cloud/cs
-shippable/cs/group1
+shippable/cs/group2
diff --git a/test/integration/targets/cs_storage_pool/aliases b/test/integration/targets/cs_storage_pool/aliases
index c89c86d7d2..a315c1b58b 100644
--- a/test/integration/targets/cs_storage_pool/aliases
+++ b/test/integration/targets/cs_storage_pool/aliases
@@ -1,2 +1,2 @@
 cloud/cs
-shippable/cs/group1
+shippable/cs/group2
diff --git a/test/integration/targets/cs_template/aliases b/test/integration/targets/cs_template/aliases
index c89c86d7d2..a315c1b58b 100644
--- a/test/integration/targets/cs_template/aliases
+++ b/test/integration/targets/cs_template/aliases
@@ -1,2 +1,2 @@
 cloud/cs
-shippable/cs/group1
+shippable/cs/group2
diff --git a/test/integration/targets/cs_traffic_type/aliases b/test/integration/targets/cs_traffic_type/aliases
index c89c86d7d2..a315c1b58b 100644
--- a/test/integration/targets/cs_traffic_type/aliases
+++ b/test/integration/targets/cs_traffic_type/aliases
@@ -1,2 +1,2 @@
 cloud/cs
-shippable/cs/group1
+shippable/cs/group2
diff --git a/test/integration/targets/cs_user/aliases b/test/integration/targets/cs_user/aliases
index c89c86d7d2..a315c1b58b 100644
--- a/test/integration/targets/cs_user/aliases
+++ b/test/integration/targets/cs_user/aliases
@@ -1,2 +1,2 @@
 cloud/cs
-shippable/cs/group1
+shippable/cs/group2
diff --git a/test/integration/targets/cs_vlan_ip_range/aliases b/test/integration/targets/cs_vlan_ip_range/aliases
index c89c86d7d2..a315c1b58b 100644
--- a/test/integration/targets/cs_vlan_ip_range/aliases
+++ b/test/integration/targets/cs_vlan_ip_range/aliases
@@ -1,2 +1,2 @@
 cloud/cs
-shippable/cs/group1
+shippable/cs/group2
diff --git a/test/integration/targets/cs_vmsnapshot/aliases b/test/integration/targets/cs_vmsnapshot/aliases
index c89c86d7d2..a315c1b58b 100644
--- a/test/integration/targets/cs_vmsnapshot/aliases
+++ b/test/integration/targets/cs_vmsnapshot/aliases
@@ -1,2 +1,2 @@
 cloud/cs
-shippable/cs/group1
+shippable/cs/group2
diff --git a/test/integration/targets/cs_volume/aliases b/test/integration/targets/cs_volume/aliases
index c89c86d7d2..a315c1b58b 100644
--- a/test/integration/targets/cs_volume/aliases
+++ b/test/integration/targets/cs_volume/aliases
@@ -1,2 +1,2 @@
 cloud/cs
-shippable/cs/group1
+shippable/cs/group2
diff --git a/test/integration/targets/cs_vpc/aliases b/test/integration/targets/cs_vpc/aliases
index c89c86d7d2..a315c1b58b 100644
--- a/test/integration/targets/cs_vpc/aliases
+++ b/test/integration/targets/cs_vpc/aliases
@@ -1,2 +1,2 @@
 cloud/cs
-shippable/cs/group1
+shippable/cs/group2
diff --git a/test/integration/targets/cs_vpc_offering/aliases b/test/integration/targets/cs_vpc_offering/aliases
index c89c86d7d2..a315c1b58b 100644
--- a/test/integration/targets/cs_vpc_offering/aliases
+++ b/test/integration/targets/cs_vpc_offering/aliases
@@ -1,2 +1,2 @@
 cloud/cs
-shippable/cs/group1
+shippable/cs/group2
diff --git a/test/integration/targets/cs_vpn_connection/aliases b/test/integration/targets/cs_vpn_connection/aliases
index c89c86d7d2..a315c1b58b 100644
--- a/test/integration/targets/cs_vpn_connection/aliases
+++ b/test/integration/targets/cs_vpn_connection/aliases
@@ -1,2 +1,2 @@
 cloud/cs
-shippable/cs/group1
+shippable/cs/group2
diff --git a/test/integration/targets/cs_vpn_customer_gateway/aliases b/test/integration/targets/cs_vpn_customer_gateway/aliases
index c89c86d7d2..a315c1b58b 100644
--- a/test/integration/targets/cs_vpn_customer_gateway/aliases
+++ b/test/integration/targets/cs_vpn_customer_gateway/aliases
@@ -1,2 +1,2 @@
 cloud/cs
-shippable/cs/group1
+shippable/cs/group2
diff --git a/test/integration/targets/cs_vpn_gateway/aliases b/test/integration/targets/cs_vpn_gateway/aliases
index c89c86d7d2..a315c1b58b 100644
--- a/test/integration/targets/cs_vpn_gateway/aliases
+++ b/test/integration/targets/cs_vpn_gateway/aliases
@@ -1,2 +1,2 @@
 cloud/cs
-shippable/cs/group1
+shippable/cs/group2
diff --git a/test/integration/targets/cs_zone/aliases b/test/integration/targets/cs_zone/aliases
index c89c86d7d2..a315c1b58b 100644
--- a/test/integration/targets/cs_zone/aliases
+++ b/test/integration/targets/cs_zone/aliases
@@ -1,2 +1,2 @@
 cloud/cs
-shippable/cs/group1
+shippable/cs/group2
diff --git a/test/integration/targets/cs_zone_info/aliases b/test/integration/targets/cs_zone_info/aliases
index 41fe8a2952..3b5a38e7f0 100644
--- a/test/integration/targets/cs_zone_info/aliases
+++ b/test/integration/targets/cs_zone_info/aliases
@@ -1,3 +1,3 @@
 cloud/cs
-shippable/cs/group1
+shippable/cs/group2
 shippable/cs/smoketest
diff --git a/test/integration/targets/docker_container/aliases b/test/integration/targets/docker_container/aliases
index d24a585757..c4591634ea 100644
--- a/test/integration/targets/docker_container/aliases
+++ b/test/integration/targets/docker_container/aliases
@@ -1,4 +1,4 @@
-shippable/posix/group4
+shippable/posix/group5
 skip/osx
 skip/freebsd
 destructive
diff --git a/test/integration/targets/docker_image/aliases b/test/integration/targets/docker_image/aliases
index 1e2b2ce41b..c4591634ea 100644
--- a/test/integration/targets/docker_image/aliases
+++ b/test/integration/targets/docker_image/aliases
@@ -1,4 +1,4 @@
-shippable/posix/group3
+shippable/posix/group5
 skip/osx
 skip/freebsd
 destructive
diff --git a/test/integration/targets/docker_network/aliases b/test/integration/targets/docker_network/aliases
index d24a585757..c4591634ea 100644
--- a/test/integration/targets/docker_network/aliases
+++ b/test/integration/targets/docker_network/aliases
@@ -1,4 +1,4 @@
-shippable/posix/group4
+shippable/posix/group5
 skip/osx
 skip/freebsd
 destructive
diff --git a/test/integration/targets/docker_swarm_service/aliases b/test/integration/targets/docker_swarm_service/aliases
index 26475c554c..438893e643 100644
--- a/test/integration/targets/docker_swarm_service/aliases
+++ b/test/integration/targets/docker_swarm_service/aliases
@@ -1,4 +1,4 @@
-shippable/posix/group4
+shippable/posix/group5
 skip/osx
 skip/freebsd
 destructive
diff --git a/test/integration/targets/ec2_vol/aliases b/test/integration/targets/ec2_vol/aliases
index e2666cfe2e..b2f0c65bf8 100644
--- a/test/integration/targets/ec2_vol/aliases
+++ b/test/integration/targets/ec2_vol/aliases
@@ -1,3 +1,3 @@
 cloud/aws
-shippable/aws/group2
+shippable/aws/group3
 ec2_vol_info
diff --git a/test/integration/targets/ec2_vpc_vpn_facts/aliases b/test/integration/targets/ec2_vpc_vpn_facts/aliases
index 6e3860bee2..157ce0c9d4 100644
--- a/test/integration/targets/ec2_vpc_vpn_facts/aliases
+++ b/test/integration/targets/ec2_vpc_vpn_facts/aliases
@@ -1,2 +1,2 @@
 cloud/aws
-shippable/aws/group2
+shippable/aws/group3
diff --git a/test/integration/targets/handlers/aliases b/test/integration/targets/handlers/aliases
index a351185be8..ebbe02472b 100644
--- a/test/integration/targets/handlers/aliases
+++ b/test/integration/targets/handlers/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group3
+shippable/posix/group5
 handlers
diff --git a/test/integration/targets/inventory_path_with_comma/aliases b/test/integration/targets/inventory_path_with_comma/aliases
index b59832142f..70a7b7a9f3 100644
--- a/test/integration/targets/inventory_path_with_comma/aliases
+++ b/test/integration/targets/inventory_path_with_comma/aliases
@@ -1 +1 @@
-shippable/posix/group3
+shippable/posix/group5
diff --git a/test/integration/targets/mysql_db/aliases b/test/integration/targets/mysql_db/aliases
index 5eb727b09b..cefc29e463 100644
--- a/test/integration/targets/mysql_db/aliases
+++ b/test/integration/targets/mysql_db/aliases
@@ -1,4 +1,4 @@
 destructive
-shippable/posix/group1
+shippable/posix/group5
 skip/osx
 skip/freebsd
diff --git a/test/integration/targets/no_log/aliases b/test/integration/targets/no_log/aliases
index b59832142f..70a7b7a9f3 100644
--- a/test/integration/targets/no_log/aliases
+++ b/test/integration/targets/no_log/aliases
@@ -1 +1 @@
-shippable/posix/group3
+shippable/posix/group5
diff --git a/test/integration/targets/openssl_certificate/aliases b/test/integration/targets/openssl_certificate/aliases
index 6eae8bd8dd..6e8edef75c 100644
--- a/test/integration/targets/openssl_certificate/aliases
+++ b/test/integration/targets/openssl_certificate/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group1
+shippable/posix/group5
 destructive
diff --git a/test/integration/targets/pip/aliases b/test/integration/targets/pip/aliases
index a4c92ef853..0d91b7de01 100644
--- a/test/integration/targets/pip/aliases
+++ b/test/integration/targets/pip/aliases
@@ -1,2 +1,2 @@
 destructive
-shippable/posix/group1
+shippable/posix/group5
diff --git a/test/integration/targets/postgresql_table/aliases b/test/integration/targets/postgresql_table/aliases
index fe75653cad..bb0094de29 100644
--- a/test/integration/targets/postgresql_table/aliases
+++ b/test/integration/targets/postgresql_table/aliases
@@ -1,3 +1,3 @@
 destructive
-shippable/posix/group4
+shippable/posix/group5
 skip/osx
diff --git a/test/integration/targets/template/aliases b/test/integration/targets/template/aliases
index 9af2d79042..b4695923cb 100644
--- a/test/integration/targets/template/aliases
+++ b/test/integration/targets/template/aliases
@@ -1,2 +1,2 @@
 needs/root
-shippable/posix/group2
+shippable/posix/group5
diff --git a/test/integration/targets/tests/aliases b/test/integration/targets/tests/aliases
index 69e3eebcfc..041b0cc7bc 100644
--- a/test/integration/targets/tests/aliases
+++ b/test/integration/targets/tests/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group2
+shippable/posix/group5
 skip/python2.6  # tests are controller only, and we no longer support Python 2.6 on the controller
diff --git a/test/integration/targets/vmware_host_config_info/aliases b/test/integration/targets/vmware_host_config_info/aliases
index dea29ccd8b..e96093f00c 100644
--- a/test/integration/targets/vmware_host_config_info/aliases
+++ b/test/integration/targets/vmware_host_config_info/aliases
@@ -1,4 +1,4 @@
-shippable/vcenter/group1
+shippable/vcenter/group2
 cloud/vcenter
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_host_config_manager/aliases b/test/integration/targets/vmware_host_config_manager/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_host_config_manager/aliases
+++ b/test/integration/targets/vmware_host_config_manager/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_host_datastore/aliases b/test/integration/targets/vmware_host_datastore/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_host_datastore/aliases
+++ b/test/integration/targets/vmware_host_datastore/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_host_dns/aliases b/test/integration/targets/vmware_host_dns/aliases
index 3eede2cbf0..0c2e2cb9bd 100644
--- a/test/integration/targets/vmware_host_dns/aliases
+++ b/test/integration/targets/vmware_host_dns/aliases
@@ -1,3 +1,3 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
diff --git a/test/integration/targets/vmware_host_dns_facts/aliases b/test/integration/targets/vmware_host_dns_facts/aliases
index 4df62ed098..527c737768 100644
--- a/test/integration/targets/vmware_host_dns_facts/aliases
+++ b/test/integration/targets/vmware_host_dns_facts/aliases
@@ -1,4 +1,4 @@
-shippable/vcenter/group1
+shippable/vcenter/group2
 cloud/vcenter
 
 needs/target/prepare_vmware_tests
diff --git a/test/integration/targets/vmware_host_dns_info/aliases b/test/integration/targets/vmware_host_dns_info/aliases
index 4df62ed098..527c737768 100644
--- a/test/integration/targets/vmware_host_dns_info/aliases
+++ b/test/integration/targets/vmware_host_dns_info/aliases
@@ -1,4 +1,4 @@
-shippable/vcenter/group1
+shippable/vcenter/group2
 cloud/vcenter
 
 needs/target/prepare_vmware_tests
diff --git a/test/integration/targets/vmware_host_facts/aliases b/test/integration/targets/vmware_host_facts/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_host_facts/aliases
+++ b/test/integration/targets/vmware_host_facts/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_host_feature_facts/aliases b/test/integration/targets/vmware_host_feature_facts/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_host_feature_facts/aliases
+++ b/test/integration/targets/vmware_host_feature_facts/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_host_feature_info/aliases b/test/integration/targets/vmware_host_feature_info/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_host_feature_info/aliases
+++ b/test/integration/targets/vmware_host_feature_info/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_host_firewall_facts/aliases b/test/integration/targets/vmware_host_firewall_facts/aliases
index 4df62ed098..527c737768 100644
--- a/test/integration/targets/vmware_host_firewall_facts/aliases
+++ b/test/integration/targets/vmware_host_firewall_facts/aliases
@@ -1,4 +1,4 @@
-shippable/vcenter/group1
+shippable/vcenter/group2
 cloud/vcenter
 
 needs/target/prepare_vmware_tests
diff --git a/test/integration/targets/vmware_host_firewall_info/aliases b/test/integration/targets/vmware_host_firewall_info/aliases
index 4df62ed098..527c737768 100644
--- a/test/integration/targets/vmware_host_firewall_info/aliases
+++ b/test/integration/targets/vmware_host_firewall_info/aliases
@@ -1,4 +1,4 @@
-shippable/vcenter/group1
+shippable/vcenter/group2
 cloud/vcenter
 
 needs/target/prepare_vmware_tests
diff --git a/test/integration/targets/vmware_host_firewall_manager/aliases b/test/integration/targets/vmware_host_firewall_manager/aliases
index eb39c07bac..18a6edd7d1 100644
--- a/test/integration/targets/vmware_host_firewall_manager/aliases
+++ b/test/integration/targets/vmware_host_firewall_manager/aliases
@@ -1,3 +1,3 @@
-shippable/vcenter/group1
+shippable/vcenter/group2
 cloud/vcenter
 needs/target/prepare_vmware_tests
diff --git a/test/integration/targets/vmware_host_hyperthreading/aliases b/test/integration/targets/vmware_host_hyperthreading/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_host_hyperthreading/aliases
+++ b/test/integration/targets/vmware_host_hyperthreading/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_host_ipv6/aliases b/test/integration/targets/vmware_host_ipv6/aliases
index eb39c07bac..18a6edd7d1 100644
--- a/test/integration/targets/vmware_host_ipv6/aliases
+++ b/test/integration/targets/vmware_host_ipv6/aliases
@@ -1,3 +1,3 @@
-shippable/vcenter/group1
+shippable/vcenter/group2
 cloud/vcenter
 needs/target/prepare_vmware_tests
diff --git a/test/integration/targets/vmware_host_kernel_manager/aliases b/test/integration/targets/vmware_host_kernel_manager/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_host_kernel_manager/aliases
+++ b/test/integration/targets/vmware_host_kernel_manager/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_host_ntp/aliases b/test/integration/targets/vmware_host_ntp/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_host_ntp/aliases
+++ b/test/integration/targets/vmware_host_ntp/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_host_ntp_facts/aliases b/test/integration/targets/vmware_host_ntp_facts/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_host_ntp_facts/aliases
+++ b/test/integration/targets/vmware_host_ntp_facts/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_host_ntp_info/aliases b/test/integration/targets/vmware_host_ntp_info/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_host_ntp_info/aliases
+++ b/test/integration/targets/vmware_host_ntp_info/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_host_package_facts/aliases b/test/integration/targets/vmware_host_package_facts/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_host_package_facts/aliases
+++ b/test/integration/targets/vmware_host_package_facts/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_host_package_info/aliases b/test/integration/targets/vmware_host_package_info/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_host_package_info/aliases
+++ b/test/integration/targets/vmware_host_package_info/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_host_powermgmt_policy/aliases b/test/integration/targets/vmware_host_powermgmt_policy/aliases
index 3eede2cbf0..0c2e2cb9bd 100644
--- a/test/integration/targets/vmware_host_powermgmt_policy/aliases
+++ b/test/integration/targets/vmware_host_powermgmt_policy/aliases
@@ -1,3 +1,3 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
diff --git a/test/integration/targets/vmware_host_powerstate/aliases b/test/integration/targets/vmware_host_powerstate/aliases
index 3eede2cbf0..0c2e2cb9bd 100644
--- a/test/integration/targets/vmware_host_powerstate/aliases
+++ b/test/integration/targets/vmware_host_powerstate/aliases
@@ -1,3 +1,3 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
diff --git a/test/integration/targets/vmware_host_scanhba/aliases b/test/integration/targets/vmware_host_scanhba/aliases
index dea29ccd8b..e96093f00c 100644
--- a/test/integration/targets/vmware_host_scanhba/aliases
+++ b/test/integration/targets/vmware_host_scanhba/aliases
@@ -1,4 +1,4 @@
-shippable/vcenter/group1
+shippable/vcenter/group2
 cloud/vcenter
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_host_service_facts/aliases b/test/integration/targets/vmware_host_service_facts/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_host_service_facts/aliases
+++ b/test/integration/targets/vmware_host_service_facts/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_host_service_info/aliases b/test/integration/targets/vmware_host_service_info/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_host_service_info/aliases
+++ b/test/integration/targets/vmware_host_service_info/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_host_service_manager/aliases b/test/integration/targets/vmware_host_service_manager/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_host_service_manager/aliases
+++ b/test/integration/targets/vmware_host_service_manager/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_host_snmp/aliases b/test/integration/targets/vmware_host_snmp/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_host_snmp/aliases
+++ b/test/integration/targets/vmware_host_snmp/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_host_ssl_facts/aliases b/test/integration/targets/vmware_host_ssl_facts/aliases
index dea29ccd8b..e96093f00c 100644
--- a/test/integration/targets/vmware_host_ssl_facts/aliases
+++ b/test/integration/targets/vmware_host_ssl_facts/aliases
@@ -1,4 +1,4 @@
-shippable/vcenter/group1
+shippable/vcenter/group2
 cloud/vcenter
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_host_ssl_info/aliases b/test/integration/targets/vmware_host_ssl_info/aliases
index dea29ccd8b..e96093f00c 100644
--- a/test/integration/targets/vmware_host_ssl_info/aliases
+++ b/test/integration/targets/vmware_host_ssl_info/aliases
@@ -1,4 +1,4 @@
-shippable/vcenter/group1
+shippable/vcenter/group2
 cloud/vcenter
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_host_vmhba_facts/aliases b/test/integration/targets/vmware_host_vmhba_facts/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_host_vmhba_facts/aliases
+++ b/test/integration/targets/vmware_host_vmhba_facts/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_host_vmhba_info/aliases b/test/integration/targets/vmware_host_vmhba_info/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_host_vmhba_info/aliases
+++ b/test/integration/targets/vmware_host_vmhba_info/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_host_vmnic_facts/aliases b/test/integration/targets/vmware_host_vmnic_facts/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_host_vmnic_facts/aliases
+++ b/test/integration/targets/vmware_host_vmnic_facts/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_host_vmnic_info/aliases b/test/integration/targets/vmware_host_vmnic_info/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_host_vmnic_info/aliases
+++ b/test/integration/targets/vmware_host_vmnic_info/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_inventory/aliases b/test/integration/targets/vmware_inventory/aliases
index a1ab2b3d9d..17d4e97ab7 100644
--- a/test/integration/targets/vmware_inventory/aliases
+++ b/test/integration/targets/vmware_inventory/aliases
@@ -1,4 +1,4 @@
-shippable/vcenter/group1
+shippable/vcenter/group2
 cloud/vcenter
 destructive
 needs/file/contrib/inventory/vmware_inventory.py
diff --git a/test/integration/targets/vmware_local_role_facts/aliases b/test/integration/targets/vmware_local_role_facts/aliases
index dea29ccd8b..e96093f00c 100644
--- a/test/integration/targets/vmware_local_role_facts/aliases
+++ b/test/integration/targets/vmware_local_role_facts/aliases
@@ -1,4 +1,4 @@
-shippable/vcenter/group1
+shippable/vcenter/group2
 cloud/vcenter
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_local_role_info/aliases b/test/integration/targets/vmware_local_role_info/aliases
index dea29ccd8b..e96093f00c 100644
--- a/test/integration/targets/vmware_local_role_info/aliases
+++ b/test/integration/targets/vmware_local_role_info/aliases
@@ -1,4 +1,4 @@
-shippable/vcenter/group1
+shippable/vcenter/group2
 cloud/vcenter
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_local_role_manager/aliases b/test/integration/targets/vmware_local_role_manager/aliases
index b6fc00bfec..900b4c2c3c 100644
--- a/test/integration/targets/vmware_local_role_manager/aliases
+++ b/test/integration/targets/vmware_local_role_manager/aliases
@@ -1,4 +1,4 @@
-shippable/vcenter/group1
+shippable/vcenter/group2
 cloud/vcenter
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_only
diff --git a/test/integration/targets/vmware_local_user_facts/aliases b/test/integration/targets/vmware_local_user_facts/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_local_user_facts/aliases
+++ b/test/integration/targets/vmware_local_user_facts/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_local_user_info/aliases b/test/integration/targets/vmware_local_user_info/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_local_user_info/aliases
+++ b/test/integration/targets/vmware_local_user_info/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_local_user_manager/aliases b/test/integration/targets/vmware_local_user_manager/aliases
index b1212da1b7..3431786750 100644
--- a/test/integration/targets/vmware_local_user_manager/aliases
+++ b/test/integration/targets/vmware_local_user_manager/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_only
diff --git a/test/integration/targets/vmware_maintenancemode/aliases b/test/integration/targets/vmware_maintenancemode/aliases
index dea29ccd8b..e96093f00c 100644
--- a/test/integration/targets/vmware_maintenancemode/aliases
+++ b/test/integration/targets/vmware_maintenancemode/aliases
@@ -1,4 +1,4 @@
-shippable/vcenter/group1
+shippable/vcenter/group2
 cloud/vcenter
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_portgroup/aliases b/test/integration/targets/vmware_portgroup/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_portgroup/aliases
+++ b/test/integration/targets/vmware_portgroup/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_portgroup_facts/aliases b/test/integration/targets/vmware_portgroup_facts/aliases
index dea29ccd8b..e96093f00c 100644
--- a/test/integration/targets/vmware_portgroup_facts/aliases
+++ b/test/integration/targets/vmware_portgroup_facts/aliases
@@ -1,4 +1,4 @@
-shippable/vcenter/group1
+shippable/vcenter/group2
 cloud/vcenter
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_portgroup_info/aliases b/test/integration/targets/vmware_portgroup_info/aliases
index 4df62ed098..527c737768 100644
--- a/test/integration/targets/vmware_portgroup_info/aliases
+++ b/test/integration/targets/vmware_portgroup_info/aliases
@@ -1,4 +1,4 @@
-shippable/vcenter/group1
+shippable/vcenter/group2
 cloud/vcenter
 
 needs/target/prepare_vmware_tests
diff --git a/test/integration/targets/vmware_resource_pool/aliases b/test/integration/targets/vmware_resource_pool/aliases
index dea29ccd8b..e96093f00c 100644
--- a/test/integration/targets/vmware_resource_pool/aliases
+++ b/test/integration/targets/vmware_resource_pool/aliases
@@ -1,4 +1,4 @@
-shippable/vcenter/group1
+shippable/vcenter/group2
 cloud/vcenter
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_resource_pool_facts/aliases b/test/integration/targets/vmware_resource_pool_facts/aliases
index b6fc00bfec..900b4c2c3c 100644
--- a/test/integration/targets/vmware_resource_pool_facts/aliases
+++ b/test/integration/targets/vmware_resource_pool_facts/aliases
@@ -1,4 +1,4 @@
-shippable/vcenter/group1
+shippable/vcenter/group2
 cloud/vcenter
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_only
diff --git a/test/integration/targets/vmware_resource_pool_info/aliases b/test/integration/targets/vmware_resource_pool_info/aliases
index b6fc00bfec..900b4c2c3c 100644
--- a/test/integration/targets/vmware_resource_pool_info/aliases
+++ b/test/integration/targets/vmware_resource_pool_info/aliases
@@ -1,4 +1,4 @@
-shippable/vcenter/group1
+shippable/vcenter/group2
 cloud/vcenter
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_only
diff --git a/test/integration/targets/vmware_target_canonical_facts/aliases b/test/integration/targets/vmware_target_canonical_facts/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_target_canonical_facts/aliases
+++ b/test/integration/targets/vmware_target_canonical_facts/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_target_canonical_info/aliases b/test/integration/targets/vmware_target_canonical_info/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_target_canonical_info/aliases
+++ b/test/integration/targets/vmware_target_canonical_info/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_vcenter_settings/aliases b/test/integration/targets/vmware_vcenter_settings/aliases
index b6fc00bfec..900b4c2c3c 100644
--- a/test/integration/targets/vmware_vcenter_settings/aliases
+++ b/test/integration/targets/vmware_vcenter_settings/aliases
@@ -1,4 +1,4 @@
-shippable/vcenter/group1
+shippable/vcenter/group2
 cloud/vcenter
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_only
diff --git a/test/integration/targets/vmware_vcenter_statistics/aliases b/test/integration/targets/vmware_vcenter_statistics/aliases
index b6fc00bfec..900b4c2c3c 100644
--- a/test/integration/targets/vmware_vcenter_statistics/aliases
+++ b/test/integration/targets/vmware_vcenter_statistics/aliases
@@ -1,4 +1,4 @@
-shippable/vcenter/group1
+shippable/vcenter/group2
 cloud/vcenter
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_only
diff --git a/test/integration/targets/vmware_vm_facts/aliases b/test/integration/targets/vmware_vm_facts/aliases
index eaf9c08d77..c2c1343eac 100644
--- a/test/integration/targets/vmware_vm_facts/aliases
+++ b/test/integration/targets/vmware_vm_facts/aliases
@@ -1,4 +1,4 @@
-shippable/vcenter/group1
+shippable/vcenter/group2
 shippable/vcenter/smoketest
 cloud/vcenter
 needs/target/prepare_vmware_tests
diff --git a/test/integration/targets/vmware_vm_host_drs_rule/aliases b/test/integration/targets/vmware_vm_host_drs_rule/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_vm_host_drs_rule/aliases
+++ b/test/integration/targets/vmware_vm_host_drs_rule/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_vm_info/aliases b/test/integration/targets/vmware_vm_info/aliases
index eaf9c08d77..c2c1343eac 100644
--- a/test/integration/targets/vmware_vm_info/aliases
+++ b/test/integration/targets/vmware_vm_info/aliases
@@ -1,4 +1,4 @@
-shippable/vcenter/group1
+shippable/vcenter/group2
 shippable/vcenter/smoketest
 cloud/vcenter
 needs/target/prepare_vmware_tests
diff --git a/test/integration/targets/vmware_vm_storage_policy_info/aliases b/test/integration/targets/vmware_vm_storage_policy_info/aliases
index b6fc00bfec..900b4c2c3c 100644
--- a/test/integration/targets/vmware_vm_storage_policy_info/aliases
+++ b/test/integration/targets/vmware_vm_storage_policy_info/aliases
@@ -1,4 +1,4 @@
-shippable/vcenter/group1
+shippable/vcenter/group2
 cloud/vcenter
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_only
diff --git a/test/integration/targets/vmware_vm_vm_drs_rule/aliases b/test/integration/targets/vmware_vm_vm_drs_rule/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_vm_vm_drs_rule/aliases
+++ b/test/integration/targets/vmware_vm_vm_drs_rule/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_vmkernel/aliases b/test/integration/targets/vmware_vmkernel/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_vmkernel/aliases
+++ b/test/integration/targets/vmware_vmkernel/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_vmkernel_facts/aliases b/test/integration/targets/vmware_vmkernel_facts/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_vmkernel_facts/aliases
+++ b/test/integration/targets/vmware_vmkernel_facts/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_vmkernel_info/aliases b/test/integration/targets/vmware_vmkernel_info/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_vmkernel_info/aliases
+++ b/test/integration/targets/vmware_vmkernel_info/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_vmotion/aliases b/test/integration/targets/vmware_vmotion/aliases
index a33355ccf6..1e26bda5d0 100644
--- a/test/integration/targets/vmware_vmotion/aliases
+++ b/test/integration/targets/vmware_vmotion/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_2esxi
diff --git a/test/integration/targets/vmware_vspan_session/aliases b/test/integration/targets/vmware_vspan_session/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_vspan_session/aliases
+++ b/test/integration/targets/vmware_vspan_session/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_vswitch/aliases b/test/integration/targets/vmware_vswitch/aliases
index 3eede2cbf0..0c2e2cb9bd 100644
--- a/test/integration/targets/vmware_vswitch/aliases
+++ b/test/integration/targets/vmware_vswitch/aliases
@@ -1,3 +1,3 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
diff --git a/test/integration/targets/vmware_vswitch_facts/aliases b/test/integration/targets/vmware_vswitch_facts/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_vswitch_facts/aliases
+++ b/test/integration/targets/vmware_vswitch_facts/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi
diff --git a/test/integration/targets/vmware_vswitch_info/aliases b/test/integration/targets/vmware_vswitch_info/aliases
index 62871ab8f0..fa0e18d454 100644
--- a/test/integration/targets/vmware_vswitch_info/aliases
+++ b/test/integration/targets/vmware_vswitch_info/aliases
@@ -1,4 +1,4 @@
 cloud/vcenter
-shippable/vcenter/group1
+shippable/vcenter/group2
 needs/target/prepare_vmware_tests
 zuul/vmware/vcenter_1esxi