From 3508e1197ef942dc14f2efbaee637214665deee5 Mon Sep 17 00:00:00 2001
From: Matt Clay <mclay@redhat.com>
Date: Tue, 3 Mar 2020 16:23:48 -0800
Subject: [PATCH] Update test matrix to prepare for migration. (#67983)

* Split fallaxy tests into their own group.

This keeps expected pass/fail tests separate during migration prep.

* Move network tests down in matrix.

This will help keep pass/fail tests grouped together during migration prep.

* Group all incidental tests together.

This will keep pass/fail tests separate leading up to migration.
---
 shippable.yml                                 | 57 +++++++++----------
 .../targets/ansible-galaxy-collection/aliases |  4 +-
 test/utils/shippable/fallaxy.sh               |  1 +
 3 files changed, 30 insertions(+), 32 deletions(-)
 create mode 120000 test/utils/shippable/fallaxy.sh

diff --git a/shippable.yml b/shippable.yml
index 15fa5c6ab68..6599fc4b0b6 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -73,21 +73,6 @@ matrix:
     - env: T=windows/2016/7
     - env: T=windows/2019/7
 
-    - env: T=i/windows/2012
-    - env: T=i/windows/2012-R2
-    - env: T=i/windows/2016
-    - env: T=i/windows/2019
-
-    - env: T=ios/csr1000v//1
-
-    - env: T=vyos/1.1.8/2.7/1
-    - env: T=vyos/1.1.8/3.6/1
-
-    - env: T=i/ios/csr1000v//1
-
-    - env: T=i/vyos/1.1.8/2.7/1
-    - env: T=i/vyos/1.1.8/3.6/1
-
     - env: T=aix/7.2/1
     - env: T=osx/10.11/1
     - env: T=rhel/7.6/1
@@ -168,6 +153,9 @@ matrix:
     - env: T=linux/ubuntu1604/5
     - env: T=linux/ubuntu1804/5
 
+    - env: T=fallaxy/2.7/1
+    - env: T=fallaxy/3.6/1
+
     - env: T=i/aix/7.2
     - env: T=i/osx/10.11
     - env: T=i/rhel/7.6
@@ -184,6 +172,30 @@ matrix:
     - env: T=i/linux/ubuntu1604
     - env: T=i/linux/ubuntu1804
 
+    - env: T=i/windows/2012
+    - env: T=i/windows/2012-R2
+    - env: T=i/windows/2016
+    - env: T=i/windows/2019
+
+    - env: T=i/ios/csr1000v//1
+    - env: T=i/vyos/1.1.8/2.7/1
+    - env: T=i/vyos/1.1.8/3.6/1
+
+    - env: T=i/aws/2.7/1
+    - env: T=i/aws/3.6/1
+    - env: T=i/azure/2.7/1
+    - env: T=i/azure/3.6/1
+    - env: T=i/vcenter//1
+    - env: T=i/cs//1
+    - env: T=i/tower//1
+    - env: T=i/cloud//1
+    - env: T=i/hcloud//1
+
+    - env: T=ios/csr1000v//1
+
+    - env: T=vyos/1.1.8/2.7/1
+    - env: T=vyos/1.1.8/3.6/1
+
     - env: T=aws/2.7/1
     - env: T=aws/3.6/1
 
@@ -196,9 +208,6 @@ matrix:
     - env: T=aws/2.7/4
     - env: T=aws/3.6/4
 
-    - env: T=i/aws/2.7/1
-    - env: T=i/aws/3.6/1
-
     - env: T=azure/2.7/1
     - env: T=azure/3.6/1
 
@@ -232,42 +241,30 @@ matrix:
     - env: T=azure/2.7/11
     - env: T=azure/3.6/11
 
-    - env: T=i/azure/2.7/1
-    - env: T=i/azure/3.6/1
-
     - env: T=vcenter/2.7/1
     - env: T=vcenter/3.6/1
 
     - env: T=vcenter/2.7/2
     - env: T=vcenter/3.6/2
 
-    - env: T=i/vcenter//1
-
     - env: T=cs/2.7/1
     - env: T=cs/3.6/1
 
     - env: T=cs/2.7/2
     - env: T=cs/3.6/2
 
-    - env: T=i/cs//1
-
     - env: T=tower/2.7/1
     - env: T=tower/3.6/1
 
-    - env: T=i/tower//1
-
     - env: T=cloud/2.7/1
     - env: T=cloud/3.6/1
 
-    - env: T=i/cloud//1
-
     - env: T=hcloud/2.7/1
     - env: T=hcloud/3.6/1
 
     - env: T=hcloud/2.7/2
     - env: T=hcloud/3.6/2
 
-    - env: T=i/hcloud//1
 branches:
   except:
     - "*-patch-*"
diff --git a/test/integration/targets/ansible-galaxy-collection/aliases b/test/integration/targets/ansible-galaxy-collection/aliases
index 8af920aef1e..4b3ebea36a8 100644
--- a/test/integration/targets/ansible-galaxy-collection/aliases
+++ b/test/integration/targets/ansible-galaxy-collection/aliases
@@ -1,3 +1,3 @@
-shippable/cloud/group1
-shippable/cloud/smoketest
+shippable/fallaxy/group1
+shippable/fallaxy/smoketest
 cloud/fallaxy
diff --git a/test/utils/shippable/fallaxy.sh b/test/utils/shippable/fallaxy.sh
new file mode 120000
index 00000000000..700ad3edcff
--- /dev/null
+++ b/test/utils/shippable/fallaxy.sh
@@ -0,0 +1 @@
+cloud.sh
\ No newline at end of file