From 1d0fd49a33bcad1bb8242216fc8bd663e2990d39 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Fri, 9 Feb 2018 18:06:53 -0800 Subject: [PATCH] Rebalance cloud tests into 5 groups. --- shippable.yml | 3 +++ test/integration/targets/aws_elasticbeanstalk_app/aliases | 2 +- .../targets/azure_rm_availabilityset_facts/aliases | 3 ++- test/integration/targets/azure_rm_image/aliases | 2 +- test/integration/targets/azure_rm_loadbalancer/aliases | 2 +- test/integration/targets/azure_rm_managed_disk/aliases | 2 +- .../targets/azure_rm_virtualmachine_extension/aliases | 2 +- .../targets/azure_rm_virtualmachineimage_facts/aliases | 4 ++-- test/integration/targets/ec2_vpc_net/aliases | 2 +- test/integration/targets/sts_assume_role/aliases | 2 +- test/integration/targets/vmware_drs_rule_facts/aliases | 1 - test/integration/targets/vmware_local_role_manager/aliases | 1 - 12 files changed, 14 insertions(+), 12 deletions(-) diff --git a/shippable.yml b/shippable.yml index 1e1c83a5b6..a215c6d8f6 100644 --- a/shippable.yml +++ b/shippable.yml @@ -87,6 +87,9 @@ matrix: - env: T=cloud/default/2.7/4 - env: T=cloud/default/3.6/4 + + - env: T=cloud/default/2.7/5 + - env: T=cloud/default/3.6/5 branches: except: - "*-patch-*" diff --git a/test/integration/targets/aws_elasticbeanstalk_app/aliases b/test/integration/targets/aws_elasticbeanstalk_app/aliases index ebdf4aa572..d6ae2f116b 100644 --- a/test/integration/targets/aws_elasticbeanstalk_app/aliases +++ b/test/integration/targets/aws_elasticbeanstalk_app/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_availabilityset_facts/aliases b/test/integration/targets/azure_rm_availabilityset_facts/aliases index 9e23ddb721..fdf4dafc4a 100644 --- a/test/integration/targets/azure_rm_availabilityset_facts/aliases +++ b/test/integration/targets/azure_rm_availabilityset_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/azure_rm_image/aliases b/test/integration/targets/azure_rm_image/aliases index 9e23ddb721..ba650dc8a8 100644 --- a/test/integration/targets/azure_rm_image/aliases +++ b/test/integration/targets/azure_rm_image/aliases @@ -1,3 +1,3 @@ cloud/azure -posix/ci/cloud/group2/azure +posix/ci/cloud/group5/azure destructive diff --git a/test/integration/targets/azure_rm_loadbalancer/aliases b/test/integration/targets/azure_rm_loadbalancer/aliases index 9e23ddb721..17006e57f6 100644 --- a/test/integration/targets/azure_rm_loadbalancer/aliases +++ b/test/integration/targets/azure_rm_loadbalancer/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_managed_disk/aliases b/test/integration/targets/azure_rm_managed_disk/aliases index b36c3f799e..ba650dc8a8 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/group4/azure +posix/ci/cloud/group5/azure destructive diff --git a/test/integration/targets/azure_rm_virtualmachine_extension/aliases b/test/integration/targets/azure_rm_virtualmachine_extension/aliases index 17006e57f6..ba650dc8a8 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/group3/azure +posix/ci/cloud/group5/azure destructive diff --git a/test/integration/targets/azure_rm_virtualmachineimage_facts/aliases b/test/integration/targets/azure_rm_virtualmachineimage_facts/aliases index fdf4dafc4a..a26fa01736 100644 --- a/test/integration/targets/azure_rm_virtualmachineimage_facts/aliases +++ b/test/integration/targets/azure_rm_virtualmachineimage_facts/aliases @@ -1,4 +1,4 @@ cloud/azure -posix/ci/cloud/group3/azure -posix/ci/cloud/group3/smoketest +posix/ci/cloud/group5/azure +posix/ci/cloud/group5/smoketest destructive diff --git a/test/integration/targets/ec2_vpc_net/aliases b/test/integration/targets/ec2_vpc_net/aliases index ebdf4aa572..d6ae2f116b 100644 --- a/test/integration/targets/ec2_vpc_net/aliases +++ b/test/integration/targets/ec2_vpc_net/aliases @@ -1,2 +1,2 @@ cloud/aws -posix/ci/cloud/group1/aws +posix/ci/cloud/group4/aws diff --git a/test/integration/targets/sts_assume_role/aliases b/test/integration/targets/sts_assume_role/aliases index b092d8ff09..f0ca18e615 100644 --- a/test/integration/targets/sts_assume_role/aliases +++ b/test/integration/targets/sts_assume_role/aliases @@ -1,3 +1,3 @@ cloud/aws -posix/ci/cloud/group1/aws +posix/ci/cloud/group4/aws iam_role diff --git a/test/integration/targets/vmware_drs_rule_facts/aliases b/test/integration/targets/vmware_drs_rule_facts/aliases index 6c641ab56a..4c6228bf7a 100644 --- a/test/integration/targets/vmware_drs_rule_facts/aliases +++ b/test/integration/targets/vmware_drs_rule_facts/aliases @@ -1,4 +1,3 @@ posix/ci/cloud/group1/vcenter -posix/ci/cloud/group1/smoketest cloud/vcenter destructive diff --git a/test/integration/targets/vmware_local_role_manager/aliases b/test/integration/targets/vmware_local_role_manager/aliases index 6c641ab56a..4c6228bf7a 100644 --- a/test/integration/targets/vmware_local_role_manager/aliases +++ b/test/integration/targets/vmware_local_role_manager/aliases @@ -1,4 +1,3 @@ posix/ci/cloud/group1/vcenter -posix/ci/cloud/group1/smoketest cloud/vcenter destructive