From 55fb18b85c85fcdc44c168feae993adb3d75863b Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Fri, 1 Sep 2017 16:47:01 -0700 Subject: [PATCH] Split cloud tests into two CI groups. --- shippable.yml | 7 +++++-- test/integration/targets/aws_api_gateway/aliases | 2 +- test/integration/targets/aws_lambda/aliases | 2 +- test/integration/targets/azure_rm_availabilityset/aliases | 2 +- .../targets/azure_rm_availabilityset_facts/aliases | 2 +- test/integration/targets/azure_rm_dnsrecordset/aliases | 2 +- .../targets/azure_rm_dnsrecordset_facts/aliases | 2 +- test/integration/targets/azure_rm_dnszone/aliases | 2 +- test/integration/targets/azure_rm_dnszone_facts/aliases | 3 ++- test/integration/targets/azure_rm_managed_disk/aliases | 2 +- test/integration/targets/azure_rm_publicipaddress/aliases | 2 +- test/integration/targets/azure_rm_storageaccount/aliases | 2 +- test/integration/targets/azure_rm_subnet/aliases | 2 +- .../targets/azure_rm_virtualmachine_extension/aliases | 2 +- .../targets/azure_rm_virtualmachine_scaleset/aliases | 2 +- test/integration/targets/azure_rm_virtualnetwork/aliases | 2 +- test/integration/targets/cs_account/aliases | 2 +- test/integration/targets/cs_affinitygroup/aliases | 2 +- test/integration/targets/cs_cluster/aliases | 2 +- test/integration/targets/cs_configuration/aliases | 2 +- test/integration/targets/cs_domain/aliases | 2 +- test/integration/targets/cs_firewall/aliases | 2 +- test/integration/targets/cs_host/aliases | 2 +- test/integration/targets/cs_instance/aliases | 2 +- test/integration/targets/cs_instance_facts/aliases | 2 +- test/integration/targets/cs_instance_nic/aliases | 2 +- .../targets/cs_instance_nic_secondaryip/aliases | 2 +- test/integration/targets/cs_instancegroup/aliases | 2 +- test/integration/targets/cs_iso/aliases | 2 +- test/integration/targets/cs_loadbalancer_rule/aliases | 2 +- test/integration/targets/cs_network_acl/aliases | 2 +- test/integration/targets/cs_network_acl_rule/aliases | 2 +- test/integration/targets/cs_pod/aliases | 2 +- test/integration/targets/cs_portforward/aliases | 2 +- test/integration/targets/cs_project/aliases | 2 +- test/integration/targets/cs_region/aliases | 2 +- test/integration/targets/cs_resourcelimit/aliases | 2 +- test/integration/targets/cs_role/aliases | 2 +- test/integration/targets/cs_router/aliases | 2 +- test/integration/targets/cs_securitygroup/aliases | 2 +- test/integration/targets/cs_securitygroup_rule/aliases | 2 +- test/integration/targets/cs_sshkeypair/aliases | 2 +- test/integration/targets/cs_storage_pool/aliases | 2 +- test/integration/targets/cs_user/aliases | 2 +- test/integration/targets/cs_vmsnapshot/aliases | 2 +- test/integration/targets/cs_volume/aliases | 2 +- test/integration/targets/cs_vpc/aliases | 2 +- test/integration/targets/cs_vpn_gateway/aliases | 2 +- test/integration/targets/cs_zone/aliases | 2 +- test/integration/targets/cs_zone_facts/aliases | 2 +- test/integration/targets/ec2_ami/aliases | 2 +- test/integration/targets/ec2_group/aliases | 2 +- test/integration/targets/ec2_key/aliases | 2 +- test/integration/targets/ec2_metadata_facts/aliases | 4 ++-- test/integration/targets/ec2_tag/aliases | 2 +- test/integration/targets/ec2_vol/aliases | 2 +- test/integration/targets/ec2_vpc/aliases | 2 +- test/integration/targets/ecs_ecr/aliases | 2 +- test/integration/targets/elb_classic_lb/aliases | 2 +- test/integration/targets/lambda_policy/aliases | 2 +- test/integration/targets/rds_param_group/aliases | 2 +- test/integration/targets/vcenter_license/aliases | 2 +- test/integration/targets/vmware_cluster/aliases | 2 +- test/integration/targets/vmware_datacenter/aliases | 2 +- test/integration/targets/vmware_dvswitch/aliases | 2 +- test/integration/targets/vmware_guest/aliases | 2 +- test/integration/targets/vmware_guest_facts/aliases | 2 +- test/integration/targets/vmware_guest_find/aliases | 2 +- test/integration/targets/vmware_guest_tools_wait/aliases | 2 +- test/integration/targets/vmware_host/aliases | 2 +- test/integration/targets/vmware_resource_pool/aliases | 2 +- test/integration/targets/vmware_vm_facts/aliases | 4 ++-- test/integration/targets/vmware_vswitch/aliases | 2 +- test/utils/shippable/cloud.sh | 4 ++-- 74 files changed, 82 insertions(+), 78 deletions(-) diff --git a/shippable.yml b/shippable.yml index 58531132cf4..ad748a0820e 100644 --- a/shippable.yml +++ b/shippable.yml @@ -56,8 +56,11 @@ matrix: - env: TEST=linux/ubuntu1604/3 - env: TEST=linux/ubuntu1604py3/3 - - env: TEST=cloud/ubuntu1604 - - env: TEST=cloud/ubuntu1604py3 + - env: TEST=cloud/ubuntu1604/1 + - env: TEST=cloud/ubuntu1604py3/1 + + - env: TEST=cloud/ubuntu1604/2 + - env: TEST=cloud/ubuntu1604py3/2 branches: except: diff --git a/test/integration/targets/aws_api_gateway/aliases b/test/integration/targets/aws_api_gateway/aliases index 495c6e74ede..ebdf4aa5720 100644 --- a/test/integration/targets/aws_api_gateway/aliases +++ b/test/integration/targets/aws_api_gateway/aliases @@ -1,2 +1,2 @@ cloud/aws -posix/ci/cloud/aws +posix/ci/cloud/group1/aws diff --git a/test/integration/targets/aws_lambda/aliases b/test/integration/targets/aws_lambda/aliases index ab9a4f233ec..9df8ea725cf 100644 --- a/test/integration/targets/aws_lambda/aliases +++ b/test/integration/targets/aws_lambda/aliases @@ -1,4 +1,4 @@ cloud/aws -posix/ci/cloud/aws +posix/ci/cloud/group1/aws execute_lambda lambda diff --git a/test/integration/targets/azure_rm_availabilityset/aliases b/test/integration/targets/azure_rm_availabilityset/aliases index d6ff84111cd..9e23ddb721f 100644 --- a/test/integration/targets/azure_rm_availabilityset/aliases +++ b/test/integration/targets/azure_rm_availabilityset/aliases @@ -1,3 +1,3 @@ cloud/azure -posix/ci/cloud/azure +posix/ci/cloud/group2/azure destructive diff --git a/test/integration/targets/azure_rm_availabilityset_facts/aliases b/test/integration/targets/azure_rm_availabilityset_facts/aliases index d6ff84111cd..9e23ddb721f 100644 --- a/test/integration/targets/azure_rm_availabilityset_facts/aliases +++ b/test/integration/targets/azure_rm_availabilityset_facts/aliases @@ -1,3 +1,3 @@ cloud/azure -posix/ci/cloud/azure +posix/ci/cloud/group2/azure destructive diff --git a/test/integration/targets/azure_rm_dnsrecordset/aliases b/test/integration/targets/azure_rm_dnsrecordset/aliases index d6ff84111cd..9e23ddb721f 100644 --- a/test/integration/targets/azure_rm_dnsrecordset/aliases +++ b/test/integration/targets/azure_rm_dnsrecordset/aliases @@ -1,3 +1,3 @@ cloud/azure -posix/ci/cloud/azure +posix/ci/cloud/group2/azure destructive diff --git a/test/integration/targets/azure_rm_dnsrecordset_facts/aliases b/test/integration/targets/azure_rm_dnsrecordset_facts/aliases index d6ff84111cd..9e23ddb721f 100644 --- a/test/integration/targets/azure_rm_dnsrecordset_facts/aliases +++ b/test/integration/targets/azure_rm_dnsrecordset_facts/aliases @@ -1,3 +1,3 @@ cloud/azure -posix/ci/cloud/azure +posix/ci/cloud/group2/azure destructive diff --git a/test/integration/targets/azure_rm_dnszone/aliases b/test/integration/targets/azure_rm_dnszone/aliases index d6ff84111cd..9e23ddb721f 100644 --- a/test/integration/targets/azure_rm_dnszone/aliases +++ b/test/integration/targets/azure_rm_dnszone/aliases @@ -1,3 +1,3 @@ cloud/azure -posix/ci/cloud/azure +posix/ci/cloud/group2/azure destructive diff --git a/test/integration/targets/azure_rm_dnszone_facts/aliases b/test/integration/targets/azure_rm_dnszone_facts/aliases index d6ff84111cd..652b6ec82fd 100644 --- a/test/integration/targets/azure_rm_dnszone_facts/aliases +++ b/test/integration/targets/azure_rm_dnszone_facts/aliases @@ -1,3 +1,4 @@ cloud/azure -posix/ci/cloud/azure +posix/ci/cloud/group2/azure +posix/ci/cloud/group2/smoketest destructive diff --git a/test/integration/targets/azure_rm_managed_disk/aliases b/test/integration/targets/azure_rm_managed_disk/aliases index d6ff84111cd..9e23ddb721f 100644 --- a/test/integration/targets/azure_rm_managed_disk/aliases +++ b/test/integration/targets/azure_rm_managed_disk/aliases @@ -1,3 +1,3 @@ cloud/azure -posix/ci/cloud/azure +posix/ci/cloud/group2/azure destructive diff --git a/test/integration/targets/azure_rm_publicipaddress/aliases b/test/integration/targets/azure_rm_publicipaddress/aliases index d6ff84111cd..9e23ddb721f 100644 --- a/test/integration/targets/azure_rm_publicipaddress/aliases +++ b/test/integration/targets/azure_rm_publicipaddress/aliases @@ -1,3 +1,3 @@ cloud/azure -posix/ci/cloud/azure +posix/ci/cloud/group2/azure destructive diff --git a/test/integration/targets/azure_rm_storageaccount/aliases b/test/integration/targets/azure_rm_storageaccount/aliases index d6ff84111cd..9e23ddb721f 100644 --- a/test/integration/targets/azure_rm_storageaccount/aliases +++ b/test/integration/targets/azure_rm_storageaccount/aliases @@ -1,3 +1,3 @@ cloud/azure -posix/ci/cloud/azure +posix/ci/cloud/group2/azure destructive diff --git a/test/integration/targets/azure_rm_subnet/aliases b/test/integration/targets/azure_rm_subnet/aliases index d6ff84111cd..9e23ddb721f 100644 --- a/test/integration/targets/azure_rm_subnet/aliases +++ b/test/integration/targets/azure_rm_subnet/aliases @@ -1,3 +1,3 @@ cloud/azure -posix/ci/cloud/azure +posix/ci/cloud/group2/azure destructive diff --git a/test/integration/targets/azure_rm_virtualmachine_extension/aliases b/test/integration/targets/azure_rm_virtualmachine_extension/aliases index d6ff84111cd..9e23ddb721f 100644 --- a/test/integration/targets/azure_rm_virtualmachine_extension/aliases +++ b/test/integration/targets/azure_rm_virtualmachine_extension/aliases @@ -1,3 +1,3 @@ cloud/azure -posix/ci/cloud/azure +posix/ci/cloud/group2/azure destructive diff --git a/test/integration/targets/azure_rm_virtualmachine_scaleset/aliases b/test/integration/targets/azure_rm_virtualmachine_scaleset/aliases index d6ff84111cd..9e23ddb721f 100644 --- a/test/integration/targets/azure_rm_virtualmachine_scaleset/aliases +++ b/test/integration/targets/azure_rm_virtualmachine_scaleset/aliases @@ -1,3 +1,3 @@ cloud/azure -posix/ci/cloud/azure +posix/ci/cloud/group2/azure destructive diff --git a/test/integration/targets/azure_rm_virtualnetwork/aliases b/test/integration/targets/azure_rm_virtualnetwork/aliases index d6ff84111cd..9e23ddb721f 100644 --- a/test/integration/targets/azure_rm_virtualnetwork/aliases +++ b/test/integration/targets/azure_rm_virtualnetwork/aliases @@ -1,3 +1,3 @@ cloud/azure -posix/ci/cloud/azure +posix/ci/cloud/group2/azure destructive diff --git a/test/integration/targets/cs_account/aliases b/test/integration/targets/cs_account/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_account/aliases +++ b/test/integration/targets/cs_account/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_affinitygroup/aliases b/test/integration/targets/cs_affinitygroup/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_affinitygroup/aliases +++ b/test/integration/targets/cs_affinitygroup/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_cluster/aliases b/test/integration/targets/cs_cluster/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_cluster/aliases +++ b/test/integration/targets/cs_cluster/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_configuration/aliases b/test/integration/targets/cs_configuration/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_configuration/aliases +++ b/test/integration/targets/cs_configuration/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_domain/aliases b/test/integration/targets/cs_domain/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_domain/aliases +++ b/test/integration/targets/cs_domain/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_firewall/aliases b/test/integration/targets/cs_firewall/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_firewall/aliases +++ b/test/integration/targets/cs_firewall/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_host/aliases b/test/integration/targets/cs_host/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_host/aliases +++ b/test/integration/targets/cs_host/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_instance/aliases b/test/integration/targets/cs_instance/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_instance/aliases +++ b/test/integration/targets/cs_instance/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_instance_facts/aliases b/test/integration/targets/cs_instance_facts/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_instance_facts/aliases +++ b/test/integration/targets/cs_instance_facts/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_instance_nic/aliases b/test/integration/targets/cs_instance_nic/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_instance_nic/aliases +++ b/test/integration/targets/cs_instance_nic/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_instance_nic_secondaryip/aliases b/test/integration/targets/cs_instance_nic_secondaryip/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_instance_nic_secondaryip/aliases +++ b/test/integration/targets/cs_instance_nic_secondaryip/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_instancegroup/aliases b/test/integration/targets/cs_instancegroup/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_instancegroup/aliases +++ b/test/integration/targets/cs_instancegroup/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_iso/aliases b/test/integration/targets/cs_iso/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_iso/aliases +++ b/test/integration/targets/cs_iso/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_loadbalancer_rule/aliases b/test/integration/targets/cs_loadbalancer_rule/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_loadbalancer_rule/aliases +++ b/test/integration/targets/cs_loadbalancer_rule/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_network_acl/aliases b/test/integration/targets/cs_network_acl/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_network_acl/aliases +++ b/test/integration/targets/cs_network_acl/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_network_acl_rule/aliases b/test/integration/targets/cs_network_acl_rule/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_network_acl_rule/aliases +++ b/test/integration/targets/cs_network_acl_rule/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_pod/aliases b/test/integration/targets/cs_pod/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_pod/aliases +++ b/test/integration/targets/cs_pod/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_portforward/aliases b/test/integration/targets/cs_portforward/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_portforward/aliases +++ b/test/integration/targets/cs_portforward/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_project/aliases b/test/integration/targets/cs_project/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_project/aliases +++ b/test/integration/targets/cs_project/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_region/aliases b/test/integration/targets/cs_region/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_region/aliases +++ b/test/integration/targets/cs_region/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_resourcelimit/aliases b/test/integration/targets/cs_resourcelimit/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_resourcelimit/aliases +++ b/test/integration/targets/cs_resourcelimit/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_role/aliases b/test/integration/targets/cs_role/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_role/aliases +++ b/test/integration/targets/cs_role/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_router/aliases b/test/integration/targets/cs_router/aliases index c755343b62d..797fbbb8a32 100644 --- a/test/integration/targets/cs_router/aliases +++ b/test/integration/targets/cs_router/aliases @@ -1,3 +1,3 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs destructive diff --git a/test/integration/targets/cs_securitygroup/aliases b/test/integration/targets/cs_securitygroup/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_securitygroup/aliases +++ b/test/integration/targets/cs_securitygroup/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_securitygroup_rule/aliases b/test/integration/targets/cs_securitygroup_rule/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_securitygroup_rule/aliases +++ b/test/integration/targets/cs_securitygroup_rule/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_sshkeypair/aliases b/test/integration/targets/cs_sshkeypair/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_sshkeypair/aliases +++ b/test/integration/targets/cs_sshkeypair/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_storage_pool/aliases b/test/integration/targets/cs_storage_pool/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_storage_pool/aliases +++ b/test/integration/targets/cs_storage_pool/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_user/aliases b/test/integration/targets/cs_user/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_user/aliases +++ b/test/integration/targets/cs_user/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_vmsnapshot/aliases b/test/integration/targets/cs_vmsnapshot/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_vmsnapshot/aliases +++ b/test/integration/targets/cs_vmsnapshot/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_volume/aliases b/test/integration/targets/cs_volume/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_volume/aliases +++ b/test/integration/targets/cs_volume/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_vpc/aliases b/test/integration/targets/cs_vpc/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_vpc/aliases +++ b/test/integration/targets/cs_vpc/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_vpn_gateway/aliases b/test/integration/targets/cs_vpn_gateway/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_vpn_gateway/aliases +++ b/test/integration/targets/cs_vpn_gateway/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_zone/aliases b/test/integration/targets/cs_zone/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_zone/aliases +++ b/test/integration/targets/cs_zone/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/cs_zone_facts/aliases b/test/integration/targets/cs_zone_facts/aliases index ba249b99d73..ee8454c6d12 100644 --- a/test/integration/targets/cs_zone_facts/aliases +++ b/test/integration/targets/cs_zone_facts/aliases @@ -1,2 +1,2 @@ cloud/cs -posix/ci/cloud/cs +posix/ci/cloud/group1/cs diff --git a/test/integration/targets/ec2_ami/aliases b/test/integration/targets/ec2_ami/aliases index 495c6e74ede..ebdf4aa5720 100644 --- a/test/integration/targets/ec2_ami/aliases +++ b/test/integration/targets/ec2_ami/aliases @@ -1,2 +1,2 @@ cloud/aws -posix/ci/cloud/aws +posix/ci/cloud/group1/aws diff --git a/test/integration/targets/ec2_group/aliases b/test/integration/targets/ec2_group/aliases index 495c6e74ede..ebdf4aa5720 100644 --- a/test/integration/targets/ec2_group/aliases +++ b/test/integration/targets/ec2_group/aliases @@ -1,2 +1,2 @@ cloud/aws -posix/ci/cloud/aws +posix/ci/cloud/group1/aws diff --git a/test/integration/targets/ec2_key/aliases b/test/integration/targets/ec2_key/aliases index 535600b17e7..49617480449 100644 --- a/test/integration/targets/ec2_key/aliases +++ b/test/integration/targets/ec2_key/aliases @@ -1,3 +1,3 @@ cloud/aws -posix/ci/cloud/aws +posix/ci/cloud/group1/aws skip/python3 diff --git a/test/integration/targets/ec2_metadata_facts/aliases b/test/integration/targets/ec2_metadata_facts/aliases index 29664c8f0a4..acee22a6cd2 100644 --- a/test/integration/targets/ec2_metadata_facts/aliases +++ b/test/integration/targets/ec2_metadata_facts/aliases @@ -1,3 +1,3 @@ cloud/aws -posix/ci/cloud/aws -posix/ci/cloud/smoketest +posix/ci/cloud/group1/aws +posix/ci/cloud/group1/smoketest diff --git a/test/integration/targets/ec2_tag/aliases b/test/integration/targets/ec2_tag/aliases index 495c6e74ede..ebdf4aa5720 100644 --- a/test/integration/targets/ec2_tag/aliases +++ b/test/integration/targets/ec2_tag/aliases @@ -1,2 +1,2 @@ cloud/aws -posix/ci/cloud/aws +posix/ci/cloud/group1/aws diff --git a/test/integration/targets/ec2_vol/aliases b/test/integration/targets/ec2_vol/aliases index 495c6e74ede..ebdf4aa5720 100644 --- a/test/integration/targets/ec2_vol/aliases +++ b/test/integration/targets/ec2_vol/aliases @@ -1,2 +1,2 @@ cloud/aws -posix/ci/cloud/aws +posix/ci/cloud/group1/aws diff --git a/test/integration/targets/ec2_vpc/aliases b/test/integration/targets/ec2_vpc/aliases index 495c6e74ede..ebdf4aa5720 100644 --- a/test/integration/targets/ec2_vpc/aliases +++ b/test/integration/targets/ec2_vpc/aliases @@ -1,2 +1,2 @@ cloud/aws -posix/ci/cloud/aws +posix/ci/cloud/group1/aws diff --git a/test/integration/targets/ecs_ecr/aliases b/test/integration/targets/ecs_ecr/aliases index 495c6e74ede..ebdf4aa5720 100644 --- a/test/integration/targets/ecs_ecr/aliases +++ b/test/integration/targets/ecs_ecr/aliases @@ -1,2 +1,2 @@ cloud/aws -posix/ci/cloud/aws +posix/ci/cloud/group1/aws diff --git a/test/integration/targets/elb_classic_lb/aliases b/test/integration/targets/elb_classic_lb/aliases index 495c6e74ede..ebdf4aa5720 100644 --- a/test/integration/targets/elb_classic_lb/aliases +++ b/test/integration/targets/elb_classic_lb/aliases @@ -1,2 +1,2 @@ cloud/aws -posix/ci/cloud/aws +posix/ci/cloud/group1/aws diff --git a/test/integration/targets/lambda_policy/aliases b/test/integration/targets/lambda_policy/aliases index 495c6e74ede..ebdf4aa5720 100644 --- a/test/integration/targets/lambda_policy/aliases +++ b/test/integration/targets/lambda_policy/aliases @@ -1,2 +1,2 @@ cloud/aws -posix/ci/cloud/aws +posix/ci/cloud/group1/aws diff --git a/test/integration/targets/rds_param_group/aliases b/test/integration/targets/rds_param_group/aliases index 495c6e74ede..ebdf4aa5720 100644 --- a/test/integration/targets/rds_param_group/aliases +++ b/test/integration/targets/rds_param_group/aliases @@ -1,2 +1,2 @@ cloud/aws -posix/ci/cloud/aws +posix/ci/cloud/group1/aws diff --git a/test/integration/targets/vcenter_license/aliases b/test/integration/targets/vcenter_license/aliases index 307f71079d1..4c6228bf7a7 100644 --- a/test/integration/targets/vcenter_license/aliases +++ b/test/integration/targets/vcenter_license/aliases @@ -1,3 +1,3 @@ -posix/ci/cloud/vcenter +posix/ci/cloud/group1/vcenter cloud/vcenter destructive diff --git a/test/integration/targets/vmware_cluster/aliases b/test/integration/targets/vmware_cluster/aliases index 307f71079d1..4c6228bf7a7 100644 --- a/test/integration/targets/vmware_cluster/aliases +++ b/test/integration/targets/vmware_cluster/aliases @@ -1,3 +1,3 @@ -posix/ci/cloud/vcenter +posix/ci/cloud/group1/vcenter cloud/vcenter destructive diff --git a/test/integration/targets/vmware_datacenter/aliases b/test/integration/targets/vmware_datacenter/aliases index 307f71079d1..4c6228bf7a7 100644 --- a/test/integration/targets/vmware_datacenter/aliases +++ b/test/integration/targets/vmware_datacenter/aliases @@ -1,3 +1,3 @@ -posix/ci/cloud/vcenter +posix/ci/cloud/group1/vcenter cloud/vcenter destructive diff --git a/test/integration/targets/vmware_dvswitch/aliases b/test/integration/targets/vmware_dvswitch/aliases index 307f71079d1..4c6228bf7a7 100644 --- a/test/integration/targets/vmware_dvswitch/aliases +++ b/test/integration/targets/vmware_dvswitch/aliases @@ -1,3 +1,3 @@ -posix/ci/cloud/vcenter +posix/ci/cloud/group1/vcenter cloud/vcenter destructive diff --git a/test/integration/targets/vmware_guest/aliases b/test/integration/targets/vmware_guest/aliases index 3cf34dcdb09..748b11da6d3 100644 --- a/test/integration/targets/vmware_guest/aliases +++ b/test/integration/targets/vmware_guest/aliases @@ -1,4 +1,4 @@ -posix/ci/cloud/vcenter +posix/ci/cloud/group1/vcenter cloud/vcenter skip/python3 destructive diff --git a/test/integration/targets/vmware_guest_facts/aliases b/test/integration/targets/vmware_guest_facts/aliases index 307f71079d1..4c6228bf7a7 100644 --- a/test/integration/targets/vmware_guest_facts/aliases +++ b/test/integration/targets/vmware_guest_facts/aliases @@ -1,3 +1,3 @@ -posix/ci/cloud/vcenter +posix/ci/cloud/group1/vcenter cloud/vcenter destructive diff --git a/test/integration/targets/vmware_guest_find/aliases b/test/integration/targets/vmware_guest_find/aliases index 307f71079d1..4c6228bf7a7 100644 --- a/test/integration/targets/vmware_guest_find/aliases +++ b/test/integration/targets/vmware_guest_find/aliases @@ -1,3 +1,3 @@ -posix/ci/cloud/vcenter +posix/ci/cloud/group1/vcenter cloud/vcenter destructive diff --git a/test/integration/targets/vmware_guest_tools_wait/aliases b/test/integration/targets/vmware_guest_tools_wait/aliases index 307f71079d1..4c6228bf7a7 100644 --- a/test/integration/targets/vmware_guest_tools_wait/aliases +++ b/test/integration/targets/vmware_guest_tools_wait/aliases @@ -1,3 +1,3 @@ -posix/ci/cloud/vcenter +posix/ci/cloud/group1/vcenter cloud/vcenter destructive diff --git a/test/integration/targets/vmware_host/aliases b/test/integration/targets/vmware_host/aliases index 307f71079d1..4c6228bf7a7 100644 --- a/test/integration/targets/vmware_host/aliases +++ b/test/integration/targets/vmware_host/aliases @@ -1,3 +1,3 @@ -posix/ci/cloud/vcenter +posix/ci/cloud/group1/vcenter cloud/vcenter destructive diff --git a/test/integration/targets/vmware_resource_pool/aliases b/test/integration/targets/vmware_resource_pool/aliases index 307f71079d1..4c6228bf7a7 100644 --- a/test/integration/targets/vmware_resource_pool/aliases +++ b/test/integration/targets/vmware_resource_pool/aliases @@ -1,3 +1,3 @@ -posix/ci/cloud/vcenter +posix/ci/cloud/group1/vcenter cloud/vcenter destructive diff --git a/test/integration/targets/vmware_vm_facts/aliases b/test/integration/targets/vmware_vm_facts/aliases index fbf079be485..6c641ab56a6 100644 --- a/test/integration/targets/vmware_vm_facts/aliases +++ b/test/integration/targets/vmware_vm_facts/aliases @@ -1,4 +1,4 @@ -posix/ci/cloud/vcenter -posix/ci/cloud/smoketest +posix/ci/cloud/group1/vcenter +posix/ci/cloud/group1/smoketest cloud/vcenter destructive diff --git a/test/integration/targets/vmware_vswitch/aliases b/test/integration/targets/vmware_vswitch/aliases index 307f71079d1..4c6228bf7a7 100644 --- a/test/integration/targets/vmware_vswitch/aliases +++ b/test/integration/targets/vmware_vswitch/aliases @@ -1,3 +1,3 @@ -posix/ci/cloud/vcenter +posix/ci/cloud/group1/vcenter cloud/vcenter destructive diff --git a/test/utils/shippable/cloud.sh b/test/utils/shippable/cloud.sh index cf80eb2fdb5..6695d8a816a 100755 --- a/test/utils/shippable/cloud.sh +++ b/test/utils/shippable/cloud.sh @@ -6,8 +6,8 @@ declare -a args IFS='/:' read -ra args <<< "${TEST}" image="ansible/ansible:${args[1]}" -target="posix/ci/cloud/" +target="posix/ci/cloud/group${args[2]}/" # shellcheck disable=SC2086 ansible-test integration --color -v --retry-on-error "${target}" --docker "${image}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \ - --changed-all-target 'posix/ci/cloud/smoketest/' + --changed-all-target "${target}smoketest/"