From 38b7ceb75a69ce8634c88ba40f7a314ff4e7f8e5 Mon Sep 17 00:00:00 2001 From: Rick Elrod Date: Thu, 9 Apr 2020 02:26:59 -0500 Subject: [PATCH] Update docker.txt to use the OpenSUSE 15.1 container image (devel edition) (#68785) * Update docker.txt to use the OpenSUSE 15.1 container image Signed-off-by: Rick Elrod * handle installing mysql on suse Signed-off-by: Rick Elrod * add changelog fragment Signed-off-by: Rick Elrod * Update changelogs/fragments/ansible-test-opensuse-15.1.yml Co-Authored-By: Matt Clay Co-authored-by: Matt Clay --- changelogs/fragments/ansible-test-opensuse-15.1.yml | 2 ++ .../targets/incidental_setup_mysql_db/tasks/main.yml | 7 +++++++ test/lib/ansible_test/_data/completion/docker.txt | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/ansible-test-opensuse-15.1.yml diff --git a/changelogs/fragments/ansible-test-opensuse-15.1.yml b/changelogs/fragments/ansible-test-opensuse-15.1.yml new file mode 100644 index 00000000000..d1d8a139860 --- /dev/null +++ b/changelogs/fragments/ansible-test-opensuse-15.1.yml @@ -0,0 +1,2 @@ +minor_changes: + - ansible-test - Upgrade OpenSUSE containers to use Leap 15.1. diff --git a/test/integration/targets/incidental_setup_mysql_db/tasks/main.yml b/test/integration/targets/incidental_setup_mysql_db/tasks/main.yml index 990cdb6e63d..d9367b4d9a6 100644 --- a/test/integration/targets/incidental_setup_mysql_db/tasks/main.yml +++ b/test/integration/targets/incidental_setup_mysql_db/tasks/main.yml @@ -63,6 +63,13 @@ when: ansible_pkg_mgr == 'apt' notify: cleanup mysql +- name: install mysqldb_test opensuse dependencies + zypper: + name: "{{ mysql_packages }}" + state: latest + when: ansible_pkg_mgr == 'zypper' + notify: cleanup mysql + - name: install mysqldb_test FreeBSD dependencies package: name: "{{ mysql_packages }}" diff --git a/test/lib/ansible_test/_data/completion/docker.txt b/test/lib/ansible_test/_data/completion/docker.txt index ecd46e74708..f809b5d9a1b 100644 --- a/test/lib/ansible_test/_data/completion/docker.txt +++ b/test/lib/ansible_test/_data/completion/docker.txt @@ -4,7 +4,7 @@ centos7 name=quay.io/ansible/centos7-test-container:1.8.0 python=2.7 seccomp=unc centos8 name=quay.io/ansible/centos8-test-container:1.10.0 python=3.6 seccomp=unconfined fedora30 name=quay.io/ansible/fedora30-test-container:1.9.2 python=3.7 fedora31 name=quay.io/ansible/fedora31-test-container:1.11.0 python=3.7 -opensuse15py2 name=quay.io/ansible/opensuse15py2-test-container:1.8.0 python=2.7 -opensuse15 name=quay.io/ansible/opensuse15-test-container:1.8.0 python=3.6 +opensuse15py2 name=quay.io/ansible/opensuse15py2-test-container:1.14.0 python=2.7 +opensuse15 name=quay.io/ansible/opensuse15-test-container:1.14.0 python=3.6 ubuntu1604 name=quay.io/ansible/ubuntu1604-test-container:1.8.0 python=2.7 seccomp=unconfined ubuntu1804 name=quay.io/ansible/ubuntu1804-test-container:1.13.0 python=3.6 seccomp=unconfined