From 6969d492d82e3c4ddc6af260c2331df1abd40ddc Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Thu, 11 Jan 2018 23:24:16 -0800 Subject: [PATCH] Split Windows tests into 4 groups. --- shippable.yml | 1 + test/integration/targets/wait_for_connection/aliases | 2 +- test/integration/targets/win_acl_inheritance/aliases | 2 +- test/integration/targets/win_audit_policy_system/aliases | 2 +- test/integration/targets/win_audit_rule/aliases | 2 +- test/integration/targets/win_chocolatey/aliases | 2 +- test/integration/targets/win_command/aliases | 2 +- test/integration/targets/win_disk_facts/aliases | 2 +- test/integration/targets/win_domain_membership/aliases | 2 +- test/integration/targets/win_dotnet_ngen/aliases | 2 +- test/integration/targets/win_dsc/aliases | 2 +- test/integration/targets/win_environment/aliases | 2 +- test/integration/targets/win_eventlog/aliases | 2 +- test/integration/targets/win_feature/aliases | 2 +- test/integration/targets/win_fetch/aliases | 2 +- test/integration/targets/win_find/aliases | 2 +- test/integration/targets/win_firewall/aliases | 2 +- test/integration/targets/win_firewall_rule/aliases | 2 +- test/integration/targets/win_get_url/aliases | 2 +- test/integration/targets/win_group_membership/aliases | 2 +- test/integration/targets/win_iis_webapppool/aliases | 2 +- test/integration/targets/win_iis_webbinding/aliases | 2 +- test/integration/targets/win_lineinfile/aliases | 2 +- test/integration/targets/win_mapped_drive/aliases | 2 +- test/integration/targets/win_module_utils_legacy/aliases | 2 +- test/integration/targets/win_msi/aliases | 2 +- test/integration/targets/win_package/aliases | 2 +- test/integration/targets/win_pagefile/aliases | 2 +- test/integration/targets/win_power_plan/aliases | 2 +- test/integration/targets/win_reg_stat/aliases | 2 +- test/integration/targets/win_regedit/aliases | 2 +- test/integration/targets/win_region/aliases | 2 +- test/integration/targets/win_regmerge/aliases | 2 +- test/integration/targets/win_route/aliases | 2 +- test/integration/targets/win_scheduled_task_stat/aliases | 2 +- test/integration/targets/win_security_policy/aliases | 2 +- test/integration/targets/win_setup/aliases | 2 +- test/integration/targets/win_share/aliases | 2 +- test/integration/targets/win_shortcut/aliases | 2 +- test/integration/targets/win_stat/aliases | 2 +- test/integration/targets/win_tempfile/aliases | 2 +- test/integration/targets/win_timezone/aliases | 2 +- test/integration/targets/win_updates/aliases | 2 +- test/integration/targets/win_user/aliases | 2 +- test/integration/targets/win_wakeonlan/aliases | 2 +- test/integration/targets/win_whoami/aliases | 2 +- 46 files changed, 46 insertions(+), 45 deletions(-) diff --git a/shippable.yml b/shippable.yml index fb93c9b8fb..101f591123 100644 --- a/shippable.yml +++ b/shippable.yml @@ -19,6 +19,7 @@ matrix: - env: T=windows/1 - env: T=windows/2 - env: T=windows/3 + - env: T=windows/4 - env: T=network diff --git a/test/integration/targets/wait_for_connection/aliases b/test/integration/targets/wait_for_connection/aliases index e4b76175b1..df343f6b0a 100644 --- a/test/integration/targets/wait_for_connection/aliases +++ b/test/integration/targets/wait_for_connection/aliases @@ -1,2 +1,2 @@ posix/ci/group1 -windows/ci/group1 +windows/ci/group4 diff --git a/test/integration/targets/win_acl_inheritance/aliases b/test/integration/targets/win_acl_inheritance/aliases index 10e03fc2bf..ee0ed5974e 100644 --- a/test/integration/targets/win_acl_inheritance/aliases +++ b/test/integration/targets/win_acl_inheritance/aliases @@ -1 +1 @@ -windows/ci/group1 +windows/ci/group2 diff --git a/test/integration/targets/win_audit_policy_system/aliases b/test/integration/targets/win_audit_policy_system/aliases index ee0ed5974e..10e03fc2bf 100644 --- a/test/integration/targets/win_audit_policy_system/aliases +++ b/test/integration/targets/win_audit_policy_system/aliases @@ -1 +1 @@ -windows/ci/group2 +windows/ci/group1 diff --git a/test/integration/targets/win_audit_rule/aliases b/test/integration/targets/win_audit_rule/aliases index c6d6198167..2854047d09 100644 --- a/test/integration/targets/win_audit_rule/aliases +++ b/test/integration/targets/win_audit_rule/aliases @@ -1 +1 @@ -windows/ci/group3 +windows/ci/group4 diff --git a/test/integration/targets/win_chocolatey/aliases b/test/integration/targets/win_chocolatey/aliases index ee0ed5974e..10e03fc2bf 100644 --- a/test/integration/targets/win_chocolatey/aliases +++ b/test/integration/targets/win_chocolatey/aliases @@ -1 +1 @@ -windows/ci/group2 +windows/ci/group1 diff --git a/test/integration/targets/win_command/aliases b/test/integration/targets/win_command/aliases index ee0ed5974e..c6d6198167 100644 --- a/test/integration/targets/win_command/aliases +++ b/test/integration/targets/win_command/aliases @@ -1 +1 @@ -windows/ci/group2 +windows/ci/group3 diff --git a/test/integration/targets/win_disk_facts/aliases b/test/integration/targets/win_disk_facts/aliases index ee0ed5974e..c6d6198167 100644 --- a/test/integration/targets/win_disk_facts/aliases +++ b/test/integration/targets/win_disk_facts/aliases @@ -1 +1 @@ -windows/ci/group2 +windows/ci/group3 diff --git a/test/integration/targets/win_domain_membership/aliases b/test/integration/targets/win_domain_membership/aliases index ee0ed5974e..10e03fc2bf 100644 --- a/test/integration/targets/win_domain_membership/aliases +++ b/test/integration/targets/win_domain_membership/aliases @@ -1 +1 @@ -windows/ci/group2 +windows/ci/group1 diff --git a/test/integration/targets/win_dotnet_ngen/aliases b/test/integration/targets/win_dotnet_ngen/aliases index 10e03fc2bf..c6d6198167 100644 --- a/test/integration/targets/win_dotnet_ngen/aliases +++ b/test/integration/targets/win_dotnet_ngen/aliases @@ -1 +1 @@ -windows/ci/group1 +windows/ci/group3 diff --git a/test/integration/targets/win_dsc/aliases b/test/integration/targets/win_dsc/aliases index ee0ed5974e..c6d6198167 100644 --- a/test/integration/targets/win_dsc/aliases +++ b/test/integration/targets/win_dsc/aliases @@ -1 +1 @@ -windows/ci/group2 +windows/ci/group3 diff --git a/test/integration/targets/win_environment/aliases b/test/integration/targets/win_environment/aliases index ee0ed5974e..2854047d09 100644 --- a/test/integration/targets/win_environment/aliases +++ b/test/integration/targets/win_environment/aliases @@ -1 +1 @@ -windows/ci/group2 +windows/ci/group4 diff --git a/test/integration/targets/win_eventlog/aliases b/test/integration/targets/win_eventlog/aliases index 10e03fc2bf..ee0ed5974e 100644 --- a/test/integration/targets/win_eventlog/aliases +++ b/test/integration/targets/win_eventlog/aliases @@ -1 +1 @@ -windows/ci/group1 +windows/ci/group2 diff --git a/test/integration/targets/win_feature/aliases b/test/integration/targets/win_feature/aliases index ee0ed5974e..c6d6198167 100644 --- a/test/integration/targets/win_feature/aliases +++ b/test/integration/targets/win_feature/aliases @@ -1 +1 @@ -windows/ci/group2 +windows/ci/group3 diff --git a/test/integration/targets/win_fetch/aliases b/test/integration/targets/win_fetch/aliases index c6d6198167..ee0ed5974e 100644 --- a/test/integration/targets/win_fetch/aliases +++ b/test/integration/targets/win_fetch/aliases @@ -1 +1 @@ -windows/ci/group3 +windows/ci/group2 diff --git a/test/integration/targets/win_find/aliases b/test/integration/targets/win_find/aliases index ee0ed5974e..10e03fc2bf 100644 --- a/test/integration/targets/win_find/aliases +++ b/test/integration/targets/win_find/aliases @@ -1 +1 @@ -windows/ci/group2 +windows/ci/group1 diff --git a/test/integration/targets/win_firewall/aliases b/test/integration/targets/win_firewall/aliases index ee0ed5974e..c6d6198167 100644 --- a/test/integration/targets/win_firewall/aliases +++ b/test/integration/targets/win_firewall/aliases @@ -1 +1 @@ -windows/ci/group2 +windows/ci/group3 diff --git a/test/integration/targets/win_firewall_rule/aliases b/test/integration/targets/win_firewall_rule/aliases index ee0ed5974e..10e03fc2bf 100644 --- a/test/integration/targets/win_firewall_rule/aliases +++ b/test/integration/targets/win_firewall_rule/aliases @@ -1 +1 @@ -windows/ci/group2 +windows/ci/group1 diff --git a/test/integration/targets/win_get_url/aliases b/test/integration/targets/win_get_url/aliases index ee0ed5974e..10e03fc2bf 100644 --- a/test/integration/targets/win_get_url/aliases +++ b/test/integration/targets/win_get_url/aliases @@ -1 +1 @@ -windows/ci/group2 +windows/ci/group1 diff --git a/test/integration/targets/win_group_membership/aliases b/test/integration/targets/win_group_membership/aliases index ee0ed5974e..2854047d09 100644 --- a/test/integration/targets/win_group_membership/aliases +++ b/test/integration/targets/win_group_membership/aliases @@ -1 +1 @@ -windows/ci/group2 +windows/ci/group4 diff --git a/test/integration/targets/win_iis_webapppool/aliases b/test/integration/targets/win_iis_webapppool/aliases index ee0ed5974e..c6d6198167 100644 --- a/test/integration/targets/win_iis_webapppool/aliases +++ b/test/integration/targets/win_iis_webapppool/aliases @@ -1 +1 @@ -windows/ci/group2 +windows/ci/group3 diff --git a/test/integration/targets/win_iis_webbinding/aliases b/test/integration/targets/win_iis_webbinding/aliases index ee0ed5974e..2854047d09 100644 --- a/test/integration/targets/win_iis_webbinding/aliases +++ b/test/integration/targets/win_iis_webbinding/aliases @@ -1 +1 @@ -windows/ci/group2 +windows/ci/group4 diff --git a/test/integration/targets/win_lineinfile/aliases b/test/integration/targets/win_lineinfile/aliases index 10e03fc2bf..ee0ed5974e 100644 --- a/test/integration/targets/win_lineinfile/aliases +++ b/test/integration/targets/win_lineinfile/aliases @@ -1 +1 @@ -windows/ci/group1 +windows/ci/group2 diff --git a/test/integration/targets/win_mapped_drive/aliases b/test/integration/targets/win_mapped_drive/aliases index 10e03fc2bf..2854047d09 100644 --- a/test/integration/targets/win_mapped_drive/aliases +++ b/test/integration/targets/win_mapped_drive/aliases @@ -1 +1 @@ -windows/ci/group1 +windows/ci/group4 diff --git a/test/integration/targets/win_module_utils_legacy/aliases b/test/integration/targets/win_module_utils_legacy/aliases index d26fc09d51..0589efba85 100644 --- a/test/integration/targets/win_module_utils_legacy/aliases +++ b/test/integration/targets/win_module_utils_legacy/aliases @@ -1,2 +1,2 @@ windows/ci/group1 -windows/ci/smoketest \ No newline at end of file +windows/ci/smoketest diff --git a/test/integration/targets/win_msi/aliases b/test/integration/targets/win_msi/aliases index ee0ed5974e..2854047d09 100644 --- a/test/integration/targets/win_msi/aliases +++ b/test/integration/targets/win_msi/aliases @@ -1 +1 @@ -windows/ci/group2 +windows/ci/group4 diff --git a/test/integration/targets/win_package/aliases b/test/integration/targets/win_package/aliases index ee0ed5974e..10e03fc2bf 100644 --- a/test/integration/targets/win_package/aliases +++ b/test/integration/targets/win_package/aliases @@ -1 +1 @@ -windows/ci/group2 +windows/ci/group1 diff --git a/test/integration/targets/win_pagefile/aliases b/test/integration/targets/win_pagefile/aliases index ee0ed5974e..2854047d09 100644 --- a/test/integration/targets/win_pagefile/aliases +++ b/test/integration/targets/win_pagefile/aliases @@ -1 +1 @@ -windows/ci/group2 +windows/ci/group4 diff --git a/test/integration/targets/win_power_plan/aliases b/test/integration/targets/win_power_plan/aliases index c6d6198167..ee0ed5974e 100644 --- a/test/integration/targets/win_power_plan/aliases +++ b/test/integration/targets/win_power_plan/aliases @@ -1 +1 @@ -windows/ci/group3 +windows/ci/group2 diff --git a/test/integration/targets/win_reg_stat/aliases b/test/integration/targets/win_reg_stat/aliases index 10e03fc2bf..c6d6198167 100644 --- a/test/integration/targets/win_reg_stat/aliases +++ b/test/integration/targets/win_reg_stat/aliases @@ -1 +1 @@ -windows/ci/group1 +windows/ci/group3 diff --git a/test/integration/targets/win_regedit/aliases b/test/integration/targets/win_regedit/aliases index 10e03fc2bf..2854047d09 100644 --- a/test/integration/targets/win_regedit/aliases +++ b/test/integration/targets/win_regedit/aliases @@ -1 +1 @@ -windows/ci/group1 +windows/ci/group4 diff --git a/test/integration/targets/win_region/aliases b/test/integration/targets/win_region/aliases index c6d6198167..2854047d09 100644 --- a/test/integration/targets/win_region/aliases +++ b/test/integration/targets/win_region/aliases @@ -1 +1 @@ -windows/ci/group3 +windows/ci/group4 diff --git a/test/integration/targets/win_regmerge/aliases b/test/integration/targets/win_regmerge/aliases index c6d6198167..10e03fc2bf 100644 --- a/test/integration/targets/win_regmerge/aliases +++ b/test/integration/targets/win_regmerge/aliases @@ -1 +1 @@ -windows/ci/group3 +windows/ci/group1 diff --git a/test/integration/targets/win_route/aliases b/test/integration/targets/win_route/aliases index c6d6198167..10e03fc2bf 100644 --- a/test/integration/targets/win_route/aliases +++ b/test/integration/targets/win_route/aliases @@ -1 +1 @@ -windows/ci/group3 +windows/ci/group1 diff --git a/test/integration/targets/win_scheduled_task_stat/aliases b/test/integration/targets/win_scheduled_task_stat/aliases index c6d6198167..ee0ed5974e 100644 --- a/test/integration/targets/win_scheduled_task_stat/aliases +++ b/test/integration/targets/win_scheduled_task_stat/aliases @@ -1 +1 @@ -windows/ci/group3 +windows/ci/group2 diff --git a/test/integration/targets/win_security_policy/aliases b/test/integration/targets/win_security_policy/aliases index c6d6198167..ee0ed5974e 100644 --- a/test/integration/targets/win_security_policy/aliases +++ b/test/integration/targets/win_security_policy/aliases @@ -1 +1 @@ -windows/ci/group3 +windows/ci/group2 diff --git a/test/integration/targets/win_setup/aliases b/test/integration/targets/win_setup/aliases index c6d6198167..2854047d09 100644 --- a/test/integration/targets/win_setup/aliases +++ b/test/integration/targets/win_setup/aliases @@ -1 +1 @@ -windows/ci/group3 +windows/ci/group4 diff --git a/test/integration/targets/win_share/aliases b/test/integration/targets/win_share/aliases index c6d6198167..ee0ed5974e 100644 --- a/test/integration/targets/win_share/aliases +++ b/test/integration/targets/win_share/aliases @@ -1 +1 @@ -windows/ci/group3 +windows/ci/group2 diff --git a/test/integration/targets/win_shortcut/aliases b/test/integration/targets/win_shortcut/aliases index c6d6198167..ee0ed5974e 100644 --- a/test/integration/targets/win_shortcut/aliases +++ b/test/integration/targets/win_shortcut/aliases @@ -1 +1 @@ -windows/ci/group3 +windows/ci/group2 diff --git a/test/integration/targets/win_stat/aliases b/test/integration/targets/win_stat/aliases index c6d6198167..2854047d09 100644 --- a/test/integration/targets/win_stat/aliases +++ b/test/integration/targets/win_stat/aliases @@ -1 +1 @@ -windows/ci/group3 +windows/ci/group4 diff --git a/test/integration/targets/win_tempfile/aliases b/test/integration/targets/win_tempfile/aliases index c6d6198167..2854047d09 100644 --- a/test/integration/targets/win_tempfile/aliases +++ b/test/integration/targets/win_tempfile/aliases @@ -1 +1 @@ -windows/ci/group3 +windows/ci/group4 diff --git a/test/integration/targets/win_timezone/aliases b/test/integration/targets/win_timezone/aliases index c6d6198167..ee0ed5974e 100644 --- a/test/integration/targets/win_timezone/aliases +++ b/test/integration/targets/win_timezone/aliases @@ -1 +1 @@ -windows/ci/group3 +windows/ci/group2 diff --git a/test/integration/targets/win_updates/aliases b/test/integration/targets/win_updates/aliases index c6d6198167..ee0ed5974e 100644 --- a/test/integration/targets/win_updates/aliases +++ b/test/integration/targets/win_updates/aliases @@ -1 +1 @@ -windows/ci/group3 +windows/ci/group2 diff --git a/test/integration/targets/win_user/aliases b/test/integration/targets/win_user/aliases index 10e03fc2bf..c6d6198167 100644 --- a/test/integration/targets/win_user/aliases +++ b/test/integration/targets/win_user/aliases @@ -1 +1 @@ -windows/ci/group1 +windows/ci/group3 diff --git a/test/integration/targets/win_wakeonlan/aliases b/test/integration/targets/win_wakeonlan/aliases index c6d6198167..2854047d09 100644 --- a/test/integration/targets/win_wakeonlan/aliases +++ b/test/integration/targets/win_wakeonlan/aliases @@ -1 +1 @@ -windows/ci/group3 +windows/ci/group4 diff --git a/test/integration/targets/win_whoami/aliases b/test/integration/targets/win_whoami/aliases index c6d6198167..2854047d09 100644 --- a/test/integration/targets/win_whoami/aliases +++ b/test/integration/targets/win_whoami/aliases @@ -1 +1 @@ -windows/ci/group3 +windows/ci/group4