diff --git a/shippable.yml b/shippable.yml index f0378c39384..9987e802fb4 100644 --- a/shippable.yml +++ b/shippable.yml @@ -68,6 +68,11 @@ matrix: - env: T=cloud/default/2.7/2 - env: T=cloud/default/3.6/2 + - env: T=cloud/default/2.7/3 + - env: T=cloud/default/3.6/3 + + - env: T=cloud/default/2.7/4 + - env: T=cloud/default/3.6/4 branches: except: - "*-patch-*" diff --git a/test/integration/targets/aws_api_gateway/aliases b/test/integration/targets/aws_api_gateway/aliases index ebdf4aa5720..d6ae2f116bc 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/group1/aws +posix/ci/cloud/group4/aws diff --git a/test/integration/targets/aws_lambda/aliases b/test/integration/targets/aws_lambda/aliases index 9df8ea725cf..27a0a52c075 100644 --- a/test/integration/targets/aws_lambda/aliases +++ b/test/integration/targets/aws_lambda/aliases @@ -1,4 +1,4 @@ cloud/aws -posix/ci/cloud/group1/aws +posix/ci/cloud/group4/aws execute_lambda lambda diff --git a/test/integration/targets/aws_s3/aliases b/test/integration/targets/aws_s3/aliases index ebdf4aa5720..d6ae2f116bc 100644 --- a/test/integration/targets/aws_s3/aliases +++ b/test/integration/targets/aws_s3/aliases @@ -1,2 +1,2 @@ cloud/aws -posix/ci/cloud/group1/aws +posix/ci/cloud/group4/aws diff --git a/test/integration/targets/azure_rm_virtualmachine/aliases b/test/integration/targets/azure_rm_virtualmachine/aliases index 9e23ddb721f..17006e57f6f 100644 --- a/test/integration/targets/azure_rm_virtualmachine/aliases +++ b/test/integration/targets/azure_rm_virtualmachine/aliases @@ -1,3 +1,3 @@ cloud/azure -posix/ci/cloud/group2/azure +posix/ci/cloud/group3/azure destructive diff --git a/test/integration/targets/azure_rm_virtualmachine_extension/aliases b/test/integration/targets/azure_rm_virtualmachine_extension/aliases index 9e23ddb721f..17006e57f6f 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/group2/azure +posix/ci/cloud/group3/azure destructive diff --git a/test/integration/targets/azure_rm_virtualmachineimage_facts/aliases b/test/integration/targets/azure_rm_virtualmachineimage_facts/aliases index 9e23ddb721f..fdf4dafc4a0 100644 --- a/test/integration/targets/azure_rm_virtualmachineimage_facts/aliases +++ b/test/integration/targets/azure_rm_virtualmachineimage_facts/aliases @@ -1,3 +1,4 @@ cloud/azure -posix/ci/cloud/group2/azure +posix/ci/cloud/group3/azure +posix/ci/cloud/group3/smoketest destructive diff --git a/test/integration/targets/ec2_ami/aliases b/test/integration/targets/ec2_ami/aliases index ed6bf47b3c8..7abf9fadd01 100644 --- a/test/integration/targets/ec2_ami/aliases +++ b/test/integration/targets/ec2_ami/aliases @@ -1,3 +1,3 @@ cloud/aws -posix/ci/cloud/group1/aws +posix/ci/cloud/group4/aws ec2_ami_facts diff --git a/test/integration/targets/ec2_elb_lb/aliases b/test/integration/targets/ec2_elb_lb/aliases index ebdf4aa5720..d6ae2f116bc 100644 --- a/test/integration/targets/ec2_elb_lb/aliases +++ b/test/integration/targets/ec2_elb_lb/aliases @@ -1,2 +1,2 @@ cloud/aws -posix/ci/cloud/group1/aws +posix/ci/cloud/group4/aws diff --git a/test/integration/targets/ec2_group/aliases b/test/integration/targets/ec2_group/aliases index ebdf4aa5720..d6ae2f116bc 100644 --- a/test/integration/targets/ec2_group/aliases +++ b/test/integration/targets/ec2_group/aliases @@ -1,2 +1,2 @@ cloud/aws -posix/ci/cloud/group1/aws +posix/ci/cloud/group4/aws diff --git a/test/integration/targets/ec2_key/aliases b/test/integration/targets/ec2_key/aliases index 49617480449..15b3ec7b1ae 100644 --- a/test/integration/targets/ec2_key/aliases +++ b/test/integration/targets/ec2_key/aliases @@ -1,3 +1,3 @@ cloud/aws -posix/ci/cloud/group1/aws +posix/ci/cloud/group4/aws skip/python3 diff --git a/test/integration/targets/ec2_metadata_facts/aliases b/test/integration/targets/ec2_metadata_facts/aliases index acee22a6cd2..13c5250d2f3 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/group1/aws -posix/ci/cloud/group1/smoketest +posix/ci/cloud/group4/aws +posix/ci/cloud/group4/smoketest diff --git a/test/integration/targets/ec2_tag/aliases b/test/integration/targets/ec2_tag/aliases index ebdf4aa5720..d6ae2f116bc 100644 --- a/test/integration/targets/ec2_tag/aliases +++ b/test/integration/targets/ec2_tag/aliases @@ -1,2 +1,2 @@ cloud/aws -posix/ci/cloud/group1/aws +posix/ci/cloud/group4/aws diff --git a/test/integration/targets/ec2_vol/aliases b/test/integration/targets/ec2_vol/aliases index ebdf4aa5720..d6ae2f116bc 100644 --- a/test/integration/targets/ec2_vol/aliases +++ b/test/integration/targets/ec2_vol/aliases @@ -1,2 +1,2 @@ cloud/aws -posix/ci/cloud/group1/aws +posix/ci/cloud/group4/aws diff --git a/test/integration/targets/ec2_vpc/aliases b/test/integration/targets/ec2_vpc/aliases index ebdf4aa5720..d6ae2f116bc 100644 --- a/test/integration/targets/ec2_vpc/aliases +++ b/test/integration/targets/ec2_vpc/aliases @@ -1,2 +1,2 @@ cloud/aws -posix/ci/cloud/group1/aws +posix/ci/cloud/group4/aws diff --git a/test/integration/targets/ec2_vpc_route_table/aliases b/test/integration/targets/ec2_vpc_route_table/aliases index ebdf4aa5720..d6ae2f116bc 100644 --- a/test/integration/targets/ec2_vpc_route_table/aliases +++ b/test/integration/targets/ec2_vpc_route_table/aliases @@ -1,2 +1,2 @@ cloud/aws -posix/ci/cloud/group1/aws +posix/ci/cloud/group4/aws diff --git a/test/integration/targets/ec2_vpc_subnet/aliases b/test/integration/targets/ec2_vpc_subnet/aliases index ebdf4aa5720..d6ae2f116bc 100644 --- a/test/integration/targets/ec2_vpc_subnet/aliases +++ b/test/integration/targets/ec2_vpc_subnet/aliases @@ -1,2 +1,2 @@ cloud/aws -posix/ci/cloud/group1/aws +posix/ci/cloud/group4/aws diff --git a/test/integration/targets/ecs_ecr/aliases b/test/integration/targets/ecs_ecr/aliases index ebdf4aa5720..d6ae2f116bc 100644 --- a/test/integration/targets/ecs_ecr/aliases +++ b/test/integration/targets/ecs_ecr/aliases @@ -1,2 +1,2 @@ cloud/aws -posix/ci/cloud/group1/aws +posix/ci/cloud/group4/aws diff --git a/test/integration/targets/elb_classic_lb/aliases b/test/integration/targets/elb_classic_lb/aliases index ebdf4aa5720..d6ae2f116bc 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/group1/aws +posix/ci/cloud/group4/aws diff --git a/test/integration/targets/lambda_policy/aliases b/test/integration/targets/lambda_policy/aliases index ebdf4aa5720..d6ae2f116bc 100644 --- a/test/integration/targets/lambda_policy/aliases +++ b/test/integration/targets/lambda_policy/aliases @@ -1,2 +1,2 @@ cloud/aws -posix/ci/cloud/group1/aws +posix/ci/cloud/group4/aws diff --git a/test/integration/targets/rds_param_group/aliases b/test/integration/targets/rds_param_group/aliases index ebdf4aa5720..d6ae2f116bc 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/group1/aws +posix/ci/cloud/group4/aws diff --git a/test/integration/targets/vcenter_license/aliases b/test/integration/targets/vcenter_license/aliases index 4c6228bf7a7..dcb429935f2 100644 --- a/test/integration/targets/vcenter_license/aliases +++ b/test/integration/targets/vcenter_license/aliases @@ -1,3 +1,3 @@ -posix/ci/cloud/group1/vcenter +posix/ci/cloud/group4/vcenter cloud/vcenter destructive diff --git a/test/integration/targets/vmware_cluster/aliases b/test/integration/targets/vmware_cluster/aliases index 4c6228bf7a7..dcb429935f2 100644 --- a/test/integration/targets/vmware_cluster/aliases +++ b/test/integration/targets/vmware_cluster/aliases @@ -1,3 +1,3 @@ -posix/ci/cloud/group1/vcenter +posix/ci/cloud/group4/vcenter cloud/vcenter destructive diff --git a/test/integration/targets/vmware_datacenter/aliases b/test/integration/targets/vmware_datacenter/aliases index 4c6228bf7a7..dcb429935f2 100644 --- a/test/integration/targets/vmware_datacenter/aliases +++ b/test/integration/targets/vmware_datacenter/aliases @@ -1,3 +1,3 @@ -posix/ci/cloud/group1/vcenter +posix/ci/cloud/group4/vcenter cloud/vcenter destructive diff --git a/test/integration/targets/vmware_dvs_portgroup/aliases b/test/integration/targets/vmware_dvs_portgroup/aliases index 4c6228bf7a7..dcb429935f2 100644 --- a/test/integration/targets/vmware_dvs_portgroup/aliases +++ b/test/integration/targets/vmware_dvs_portgroup/aliases @@ -1,3 +1,3 @@ -posix/ci/cloud/group1/vcenter +posix/ci/cloud/group4/vcenter cloud/vcenter destructive diff --git a/test/integration/targets/vmware_dvswitch/aliases b/test/integration/targets/vmware_dvswitch/aliases index 4c6228bf7a7..dcb429935f2 100644 --- a/test/integration/targets/vmware_dvswitch/aliases +++ b/test/integration/targets/vmware_dvswitch/aliases @@ -1,3 +1,3 @@ -posix/ci/cloud/group1/vcenter +posix/ci/cloud/group4/vcenter cloud/vcenter destructive diff --git a/test/integration/targets/vmware_guest/aliases b/test/integration/targets/vmware_guest/aliases index 748b11da6d3..cc473f72806 100644 --- a/test/integration/targets/vmware_guest/aliases +++ b/test/integration/targets/vmware_guest/aliases @@ -1,4 +1,4 @@ -posix/ci/cloud/group1/vcenter +posix/ci/cloud/group4/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 4c6228bf7a7..dcb429935f2 100644 --- a/test/integration/targets/vmware_guest_facts/aliases +++ b/test/integration/targets/vmware_guest_facts/aliases @@ -1,3 +1,3 @@ -posix/ci/cloud/group1/vcenter +posix/ci/cloud/group4/vcenter cloud/vcenter destructive diff --git a/test/integration/targets/vmware_guest_find/aliases b/test/integration/targets/vmware_guest_find/aliases index 4c6228bf7a7..dcb429935f2 100644 --- a/test/integration/targets/vmware_guest_find/aliases +++ b/test/integration/targets/vmware_guest_find/aliases @@ -1,3 +1,3 @@ -posix/ci/cloud/group1/vcenter +posix/ci/cloud/group4/vcenter cloud/vcenter destructive diff --git a/test/integration/targets/vmware_guest_powerstate/aliases b/test/integration/targets/vmware_guest_powerstate/aliases index 748b11da6d3..cc473f72806 100644 --- a/test/integration/targets/vmware_guest_powerstate/aliases +++ b/test/integration/targets/vmware_guest_powerstate/aliases @@ -1,4 +1,4 @@ -posix/ci/cloud/group1/vcenter +posix/ci/cloud/group4/vcenter cloud/vcenter skip/python3 destructive diff --git a/test/integration/targets/vmware_guest_snapshot/aliases b/test/integration/targets/vmware_guest_snapshot/aliases index 748b11da6d3..cc473f72806 100644 --- a/test/integration/targets/vmware_guest_snapshot/aliases +++ b/test/integration/targets/vmware_guest_snapshot/aliases @@ -1,4 +1,4 @@ -posix/ci/cloud/group1/vcenter +posix/ci/cloud/group4/vcenter cloud/vcenter skip/python3 destructive diff --git a/test/integration/targets/vmware_guest_tools_wait/aliases b/test/integration/targets/vmware_guest_tools_wait/aliases index 4c6228bf7a7..dcb429935f2 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/group1/vcenter +posix/ci/cloud/group4/vcenter cloud/vcenter destructive diff --git a/test/integration/targets/vmware_host/aliases b/test/integration/targets/vmware_host/aliases index 4c6228bf7a7..dcb429935f2 100644 --- a/test/integration/targets/vmware_host/aliases +++ b/test/integration/targets/vmware_host/aliases @@ -1,3 +1,3 @@ -posix/ci/cloud/group1/vcenter +posix/ci/cloud/group4/vcenter cloud/vcenter destructive diff --git a/test/integration/targets/vmware_host_facts/aliases b/test/integration/targets/vmware_host_facts/aliases index df1b1a803b0..6ee4e3d4f9f 100644 --- a/test/integration/targets/vmware_host_facts/aliases +++ b/test/integration/targets/vmware_host_facts/aliases @@ -1,3 +1,3 @@ -posix/ci/cloud/vcenter +posix/ci/cloud/group4/vcenter cloud/vcenter diff --git a/test/integration/targets/vmware_resource_pool/aliases b/test/integration/targets/vmware_resource_pool/aliases index 4c6228bf7a7..dcb429935f2 100644 --- a/test/integration/targets/vmware_resource_pool/aliases +++ b/test/integration/targets/vmware_resource_pool/aliases @@ -1,3 +1,3 @@ -posix/ci/cloud/group1/vcenter +posix/ci/cloud/group4/vcenter cloud/vcenter destructive diff --git a/test/integration/targets/vmware_vswitch/aliases b/test/integration/targets/vmware_vswitch/aliases index 4c6228bf7a7..dcb429935f2 100644 --- a/test/integration/targets/vmware_vswitch/aliases +++ b/test/integration/targets/vmware_vswitch/aliases @@ -1,3 +1,3 @@ -posix/ci/cloud/group1/vcenter +posix/ci/cloud/group4/vcenter cloud/vcenter destructive