From 26c4150f958c0cd4dbf04b60bc9bf72e74a29ab5 Mon Sep 17 00:00:00 2001
From: John Barker <john@johnrbarker.com>
Date: Tue, 10 Mar 2020 14:58:46 +0000
Subject: [PATCH] run integration tests first

---
 shippable.yml                      | 32 ++++++++++++++++--------------
 tests/utils/shippable/shippable.sh |  2 +-
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/shippable.yml b/shippable.yml
index ba91c5f..2c80343 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -8,6 +8,23 @@ matrix:
   exclude:
     - env: T=none
   include:
+      # FIXME Move integration tests after units
+    - env: T=aix/7.2/1
+    - env: T=osx/10.11/1
+    - env: T=rhel/7.6/1
+    - env: T=rhel/8.1/1
+    - env: T=freebsd/11.1/1
+    - env: T=freebsd/12.1/1
+    - env: T=linux/centos6/1
+    - env: T=linux/centos7/1
+    - env: T=linux/centos8/1
+    - env: T=linux/fedora30/1
+    - env: T=linux/fedora31/1
+    - env: T=linux/opensuse15py2/1
+    - env: T=linux/opensuse15/1
+    - env: T=linux/ubuntu1604/1
+    - env: T=linux/ubuntu1804/1
+
     - env: T=sanity/1
     - env: T=sanity/2
     - env: T=sanity/3
@@ -38,21 +55,6 @@ matrix:
     - env: T=units/3.8/3
     - env: T=units/3.9/3
 
-    - env: T=aix/7.2/1
-    - env: T=osx/10.11/1
-    - env: T=rhel/7.6/1
-    - env: T=rhel/8.1/1
-    - env: T=freebsd/11.1/1
-    - env: T=freebsd/12.1/1
-    - env: T=linux/centos6/1
-    - env: T=linux/centos7/1
-    - env: T=linux/centos8/1
-    - env: T=linux/fedora30/1
-    - env: T=linux/fedora31/1
-    - env: T=linux/opensuse15py2/1
-    - env: T=linux/opensuse15/1
-    - env: T=linux/ubuntu1604/1
-    - env: T=linux/ubuntu1804/1
 
     - env: T=fallaxy/2.7/1
     - env: T=fallaxy/3.6/1
diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh
index 41fedb4..b5b9845 100755
--- a/tests/utils/shippable/shippable.sh
+++ b/tests/utils/shippable/shippable.sh
@@ -122,7 +122,7 @@ fi
 # STAR: HACK install dependencies
 (
 mkdir /tmp/collection_deps
-git clone https://github.com/ansible-collection-migration/community.general.git /tmp/collection_deps/community.general
+git clone https://github.com/ansible-collections/community.general.git /tmp/collection_deps/community.general
 cd /tmp/collection_deps/community.general
 ansible-galaxy collection build
 ansible-galaxy collection install community-general*