summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRick Elrod <rick@elrod.me>2020-04-09 02:26:59 -0500
committerGitHub <noreply@github.com>2020-04-09 00:26:59 -0700
commit38b7ceb75a69ce8634c88ba40f7a314ff4e7f8e5 (patch)
treec23fc9c21de293f3637d51993dd54dbb6fcbd295
parent6f8a1d083ea0d84ed4a2ca4b32b6084e35a7b460 (diff)
downloadansible-38b7ceb75a69ce8634c88ba40f7a314ff4e7f8e5.tar.gz
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 <rick@elrod.me> * handle installing mysql on suse Signed-off-by: Rick Elrod <rick@elrod.me> * add changelog fragment Signed-off-by: Rick Elrod <rick@elrod.me> * Update changelogs/fragments/ansible-test-opensuse-15.1.yml Co-Authored-By: Matt Clay <matt@mystile.com> Co-authored-by: Matt Clay <matt@mystile.com>
-rw-r--r--changelogs/fragments/ansible-test-opensuse-15.1.yml2
-rw-r--r--test/integration/targets/incidental_setup_mysql_db/tasks/main.yml7
-rw-r--r--test/lib/ansible_test/_data/completion/docker.txt4
3 files changed, 11 insertions, 2 deletions
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 0000000000..d1d8a13986
--- /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 990cdb6e63..d9367b4d9a 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 ecd46e7470..f809b5d9a1 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