From 38bf7ab71f5238cde474457d383e35f05e4b6843 Mon Sep 17 00:00:00 2001
From: Matt Clay <matt@mystile.com>
Date: Tue, 3 Jan 2017 13:10:46 -0800
Subject: [PATCH] Use newer test images for Fedora and openSUSE.

---
 shippable.yml              | 21 ++++++++++++---------
 test/integration/README.md |  7 ++++---
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/shippable.yml b/shippable.yml
index 31fc99e08fc..ce4ecfb6489 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -18,9 +18,10 @@ matrix:
 
     - env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:centos6
     - env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:centos7
-    - env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:fedora-rawhide
-    - env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:fedora23
-    - env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:opensuseleap
+    - env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:fedora24
+    - env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:fedora25
+    - env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:opensuse42.1
+    - env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:opensuse42.2
     - env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:ubuntu1204 PRIVILEGED=true
     - env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:ubuntu1404 PRIVILEGED=true
     - env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:ubuntu1604
@@ -28,9 +29,10 @@ matrix:
 
     - env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:centos6
     - env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:centos7 PRIVILEGED=true
-    - env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:fedora-rawhide PRIVILEGED=true
-    - env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:fedora23 PRIVILEGED=true
-    - env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:opensuseleap PRIVILEGED=true
+    - env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:fedora24 PRIVILEGED=true
+    - env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:fedora25 PRIVILEGED=true
+    - env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:opensuse42.1 PRIVILEGED=true
+    - env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:opensuse42.2 PRIVILEGED=true
     - env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:ubuntu1204 PRIVILEGED=true
     - env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:ubuntu1404 PRIVILEGED=true
     - env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:ubuntu1604 PRIVILEGED=true
@@ -38,9 +40,10 @@ matrix:
 
     - env: TEST=integration TARGET=other IMAGE=ansible/ansible:centos6
     - env: TEST=integration TARGET=other IMAGE=ansible/ansible:centos7
-    - env: TEST=integration TARGET=other IMAGE=ansible/ansible:fedora-rawhide
-    - env: TEST=integration TARGET=other IMAGE=ansible/ansible:fedora23
-    - env: TEST=integration TARGET=other IMAGE=ansible/ansible:opensuseleap
+    - env: TEST=integration TARGET=other IMAGE=ansible/ansible:fedora24
+    - env: TEST=integration TARGET=other IMAGE=ansible/ansible:fedora25
+    - env: TEST=integration TARGET=other IMAGE=ansible/ansible:opensuse42.1
+    - env: TEST=integration TARGET=other IMAGE=ansible/ansible:opensuse42.2
     - env: TEST=integration TARGET=other IMAGE=ansible/ansible:ubuntu1204
     - env: TEST=integration TARGET=other IMAGE=ansible/ansible:ubuntu1404
     - env: TEST=integration TARGET=other IMAGE=ansible/ansible:ubuntu1604
diff --git a/test/integration/README.md b/test/integration/README.md
index 057784c113c..258925f38ed 100644
--- a/test/integration/README.md
+++ b/test/integration/README.md
@@ -130,9 +130,10 @@ Most container images are for testing with Python 2:
 
   - centos6
   - centos7
-  - fedora-rawhide
-  - fedora23
-  - opensuseleap
+  - fedora24
+  - fedora25
+  - opensuse42.1
+  - opensuse42.2
   - ubuntu1204 (requires `PRIVILEGED=true`)
   - ubuntu1404 (requires `PRIVILEGED=true`)
   - ubuntu1604