From f71a7b9fbdd0b072e9cfb08fa0d6b1ab0685d3cf Mon Sep 17 00:00:00 2001
From: Sam Doran <sdoran@redhat.com>
Date: Fri, 21 Jun 2019 10:55:58 -0400
Subject: [PATCH] [stable-2.6] Add Fedora 30 to test matrix (#57713)

Remove Fedora 28 from test matrix.
(cherry picked from commit 7b9d991f78b1916fb0019bdd110f3582d4afb871)

Co-authored-by: Sam Doran <sdoran@redhat.com>
---
 shippable.yml                     | 6 +++---
 test/runner/completion/docker.txt | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/shippable.yml b/shippable.yml
index 4eab9ce4548..1458457dcc9 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -54,8 +54,8 @@ matrix:
     - env: T=freebsd/11.1/1
     - env: T=linux/centos6/1
     - env: T=linux/centos7/1
-    - env: T=linux/fedora28/1
     - env: T=linux/fedora29/1
+    - env: T=linux/fedora30/1
     - env: T=linux/opensuse15py2/1
     - env: T=linux/opensuse15/1
     - env: T=linux/ubuntu1604/1
@@ -66,8 +66,8 @@ matrix:
     - env: T=freebsd/11.1/2
     - env: T=linux/centos6/2
     - env: T=linux/centos7/2
-    - env: T=linux/fedora28/2
     - env: T=linux/fedora29/2
+    - env: T=linux/fedora30/2
     - env: T=linux/opensuse15py2/2
     - env: T=linux/opensuse15/2
     - env: T=linux/ubuntu1604/2
@@ -78,8 +78,8 @@ matrix:
     - env: T=freebsd/11.1/3
     - env: T=linux/centos6/3
     - env: T=linux/centos7/3
-    - env: T=linux/fedora28/3
     - env: T=linux/fedora29/3
+    - env: T=linux/fedora30/3
     - env: T=linux/opensuse15py2/3
     - env: T=linux/opensuse15/3
     - env: T=linux/ubuntu1604/3
diff --git a/test/runner/completion/docker.txt b/test/runner/completion/docker.txt
index c0d94c17143..f5e5bbb6d12 100644
--- a/test/runner/completion/docker.txt
+++ b/test/runner/completion/docker.txt
@@ -1,8 +1,8 @@
 default name=quay.io/ansible/default-test-container:1.4.1 python=3
 centos6 name=quay.io/ansible/centos6-test-container:1.4.0 seccomp=unconfined
 centos7 name=quay.io/ansible/centos7-test-container:1.4.0 seccomp=unconfined
-fedora28 name=quay.io/ansible/fedora28-test-container:1.5.0
 fedora29 name=quay.io/ansible/fedora29-test-container:1.5.0 python=3
+fedora30 name=quay.io/ansible/fedora30-test-container:1.9.2 python=3
 opensuse15py2 name=quay.io/ansible/opensuse15py2-test-container:1.7.0
 opensuse15 name=quay.io/ansible/opensuse15-test-container:1.7.0 python=3
 ubuntu1604 name=quay.io/ansible/ubuntu1604-test-container:1.4.0 seccomp=unconfined