From 8b483b16406e047f1ea060e06eea759e6ce99aab Mon Sep 17 00:00:00 2001 From: Jordan Borean Date: Mon, 25 Feb 2019 11:38:29 +1000 Subject: [PATCH] OpenSUSE - Add OpenSUSE 15 test containers (#52793) * OpenSUSE - Add OpenSUSE 15 test containers ci_complete * Reset matrix back to normal * Set container version instead of latest * Remove old Docker completion file (cherry picked from commit 3635c59b23e16862946ba0deb054195c42316fbc) --- shippable.yml | 9 ++++++--- test/runner/completion/docker.txt | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/shippable.yml b/shippable.yml index 13f95936a21..4a8f8c59407 100644 --- a/shippable.yml +++ b/shippable.yml @@ -56,7 +56,8 @@ matrix: - env: T=linux/centos7/1 - env: T=linux/fedora28/1 - env: T=linux/fedora29/1 - - env: T=linux/opensuse42.3/1 + - env: T=linux/opensuse15py2/1 + - env: T=linux/opensuse15/1 - env: T=linux/ubuntu1404/1 - env: T=linux/ubuntu1604/1 - env: T=linux/ubuntu1604py3/1 @@ -69,7 +70,8 @@ matrix: - env: T=linux/centos7/2 - env: T=linux/fedora28/2 - env: T=linux/fedora29/2 - - env: T=linux/opensuse42.3/2 + - env: T=linux/opensuse15py2/2 + - env: T=linux/opensuse15/2 - env: T=linux/ubuntu1404/2 - env: T=linux/ubuntu1604/2 - env: T=linux/ubuntu1604py3/2 @@ -82,7 +84,8 @@ matrix: - env: T=linux/centos7/3 - env: T=linux/fedora28/3 - env: T=linux/fedora29/3 - - env: T=linux/opensuse42.3/3 + - env: T=linux/opensuse15py2/3 + - env: T=linux/opensuse15/3 - env: T=linux/ubuntu1404/3 - env: T=linux/ubuntu1604/3 - env: T=linux/ubuntu1604py3/3 diff --git a/test/runner/completion/docker.txt b/test/runner/completion/docker.txt index 9d2b457e632..0dba5e656fa 100644 --- a/test/runner/completion/docker.txt +++ b/test/runner/completion/docker.txt @@ -3,7 +3,8 @@ 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 -opensuse42.3 name=quay.io/ansible/opensuse42.3-test-container:1.4.0 seccomp=unconfined +opensuse15py2 name=quay.io/ansible/opensuse15py2-test-container:1.7.0 +opensuse15 name=quay.io/ansible/opensuse15-test-container:1.7.0 python=3 ubuntu1404 name=quay.io/ansible/ubuntu1404-test-container:1.4.0 seccomp=unconfined ubuntu1604 name=quay.io/ansible/ubuntu1604-test-container:1.4.0 seccomp=unconfined ubuntu1604py3 name=quay.io/ansible/ubuntu1604py3-test-container:1.4.0 seccomp=unconfined python=3