diff options
| author | Matt Clay <matt@mystile.com> | 2020-03-10 09:07:46 -0700 |
|---|---|---|
| committer | Matt Clay <matt@mystile.com> | 2020-03-10 13:50:27 -0700 |
| commit | 6994ef0b554a816f02e0771cb14341a421f7cead (patch) | |
| tree | cd6ff40b686af07ac57d8c52970754b424273dc5 | |
| parent | 6059abd4955172632e2a2ff4c3ff3a3fb45e6777 (diff) | |
| download | ansible-6994ef0b554a816f02e0771cb14341a421f7cead.tar.gz | |
Consolidate Windows tests to one group.
| -rw-r--r-- | shippable.yml | 5 | ||||
| -rw-r--r-- | test/integration/targets/collections/aliases | 2 | ||||
| -rw-r--r-- | test/integration/targets/win_fetch/aliases | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/shippable.yml b/shippable.yml index 6349cd8f6c..fcd3489022 100644 --- a/shippable.yml +++ b/shippable.yml @@ -27,11 +27,6 @@ matrix: - env: T=windows/2016/1 - env: T=windows/2019/1 - - env: T=windows/2012/2 - - env: T=windows/2012-R2/2 - - env: T=windows/2016/2 - - env: T=windows/2019/2 - - env: T=aix/7.2/1 - env: T=osx/10.11/1 - env: T=rhel/7.6/1 diff --git a/test/integration/targets/collections/aliases b/test/integration/targets/collections/aliases index f44f511f19..853c56395b 100644 --- a/test/integration/targets/collections/aliases +++ b/test/integration/targets/collections/aliases @@ -1,5 +1,5 @@ posix shippable/posix/group4 -shippable/windows/group2 +shippable/windows/group1 skip/python2.6 windows diff --git a/test/integration/targets/win_fetch/aliases b/test/integration/targets/win_fetch/aliases index 423ce39108..4cd27b3cb2 100644 --- a/test/integration/targets/win_fetch/aliases +++ b/test/integration/targets/win_fetch/aliases @@ -1 +1 @@ -shippable/windows/group2 +shippable/windows/group1 |