diff options
| author | Rick Elrod <rick@elrod.me> | 2020-04-09 02:31:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-09 00:31:17 -0700 |
| commit | 3d8d43bd4ce9c2c40e1a2ac3c68f2f2d2fec9a20 (patch) | |
| tree | ffcc2d0e7b6c252882d8a0f58657b0982ac12710 | |
| parent | f8de20b3b0ef75027a1c97d61a058a27aa328127 (diff) | |
| download | ansible-3d8d43bd4ce9c2c40e1a2ac3c68f2f2d2fec9a20.tar.gz | |
OpenSUSE15.1 container image + necessary test changes (2.7 edition) (#68801)
* 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>
* handle installing mysql on suse
Signed-off-by: Rick Elrod <rick@elrod.me>
* attempt to get tests passing again
Signed-off-by: Rick Elrod <rick@elrod.me>
* Update docker.txt to use the OpenSUSE 15.1 container image
Signed-off-by: Rick Elrod <rick@elrod.me>
Co-authored-by: Matt Clay <matt@mystile.com>
| -rw-r--r-- | changelogs/fragments/ansible-test-opensuse-15.1.yml | 2 | ||||
| -rw-r--r-- | test/integration/targets/setup_mysql_db/tasks/main.yml | 7 | ||||
| -rw-r--r-- | test/integration/targets/zypper/tasks/zypper.yml | 9 | ||||
| -rw-r--r-- | test/runner/completion/docker.txt | 4 |
4 files changed, 18 insertions, 4 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/setup_mysql_db/tasks/main.yml b/test/integration/targets/setup_mysql_db/tasks/main.yml index 64fb4f0d71..fe0ad8dd3f 100644 --- a/test/integration/targets/setup_mysql_db/tasks/main.yml +++ b/test/integration/targets/setup_mysql_db/tasks/main.yml @@ -71,6 +71,13 @@ with_items: "{{mysql_packages}}" when: ansible_pkg_mgr == 'apt' +- 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 pkgng: name: "{{ item }}" diff --git a/test/integration/targets/zypper/tasks/zypper.yml b/test/integration/targets/zypper/tasks/zypper.yml index d817d66564..5806147d3d 100644 --- a/test/integration/targets/zypper/tasks/zypper.yml +++ b/test/integration/targets/zypper/tasks/zypper.yml @@ -1,10 +1,10 @@ - name: get hello package version - shell: zypper --xml se -svx hello | grep 'name="hello"' | sed 's/.*edition="\([^ ]*\)".*/\1/' + shell: zypper --xml se -svx hello | grep 'name="hello"' | grep 'repository="Main Repository"' | sed 's/.*edition="\([^ ]*\)".*/\1/' register: hello_version - name: set URL of test package set_fact: - hello_package_url: http://download.opensuse.org/repositories/openSUSE:/Leap:/{{ ansible_distribution_version }}/standard/x86_64/hello-{{ hello_version.stdout }}.x86_64.rpm + hello_package_url: https://download.opensuse.org/distribution/leap/{{ ansible_distribution_version }}/repo/oss/x86_64/hello-{{ hello_version.stdout }}.x86_64.rpm - debug: var=hello_package_url @@ -179,6 +179,11 @@ name: empty state: removed +- name: install rpmbuild + zypper: + name: rpmbuild + state: present + - name: clean zypper RPM cache file: name: /var/cache/zypper/RPMS diff --git a/test/runner/completion/docker.txt b/test/runner/completion/docker.txt index 7d1b3dc681..2fe557722f 100644 --- a/test/runner/completion/docker.txt +++ b/test/runner/completion/docker.txt @@ -3,7 +3,7 @@ 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 fedora29 name=quay.io/ansible/fedora29-test-container:1.9.4 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 +opensuse15py2 name=quay.io/ansible/opensuse15py2-test-container:1.14.0 +opensuse15 name=quay.io/ansible/opensuse15-test-container:1.14.0 python=3 ubuntu1604 name=quay.io/ansible/ubuntu1604-test-container:1.4.0 seccomp=unconfined ubuntu1804 name=quay.io/ansible/ubuntu1804-test-container:1.6.0 seccomp=unconfined python=3 |