From d4a3d6cd0a090e455dcd566db72742fac5aec3d9 Mon Sep 17 00:00:00 2001 From: Rick Elrod Date: Tue, 27 Apr 2021 00:16:36 -0500 Subject: [PATCH] [ansible-test] Sync opensuse containers with 2.10 (#74436) * [ansible-test] Sync opensuse containers with 2.10 Change: - OpenSuSE 15.1 is now EOL - Switch containers to use what 2.10 uses, which has 15.2. Test Plan: - ci_complete Signed-off-by: Rick Elrod * docker version Signed-off-by: Rick Elrod * needs p7zip-full, otherwise we only get 7zr Signed-off-by: Rick Elrod * Make sure py2 stays py2 Signed-off-by: Rick Elrod * no wildcard? Signed-off-by: Rick Elrod * -x instead of --xml Signed-off-by: Rick Elrod --- changelogs/fragments/ansible-test-opensuse-15-2.yml | 2 ++ test/integration/targets/iso_extract/vars/Suse.yml | 2 +- test/integration/targets/setup_docker/vars/Suse.yml | 2 +- test/integration/targets/setup_mysql_db/vars/Suse-py3.yml | 5 +++++ test/integration/targets/setup_mysql_db/vars/Suse.yml | 7 +++++++ test/integration/targets/zypper/tasks/zypper.yml | 2 +- test/lib/ansible_test/_data/completion/docker.txt | 4 ++-- 7 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 changelogs/fragments/ansible-test-opensuse-15-2.yml diff --git a/changelogs/fragments/ansible-test-opensuse-15-2.yml b/changelogs/fragments/ansible-test-opensuse-15-2.yml new file mode 100644 index 00000000000..fd2d8b66a5b --- /dev/null +++ b/changelogs/fragments/ansible-test-opensuse-15-2.yml @@ -0,0 +1,2 @@ +minor_changes: + - ansible-test - Use version 1.21.0 of opensuse test containers which is 15.2, since 15.1 is now EOL. diff --git a/test/integration/targets/iso_extract/vars/Suse.yml b/test/integration/targets/iso_extract/vars/Suse.yml index f9e7ca1a9ad..219c4957642 100644 --- a/test/integration/targets/iso_extract/vars/Suse.yml +++ b/test/integration/targets/iso_extract/vars/Suse.yml @@ -1 +1 @@ -iso_extract_7zip_package: p7zip +iso_extract_7zip_package: p7zip-full diff --git a/test/integration/targets/setup_docker/vars/Suse.yml b/test/integration/targets/setup_docker/vars/Suse.yml index b740861f34b..33489a8ee33 100644 --- a/test/integration/targets/setup_docker/vars/Suse.yml +++ b/test/integration/targets/setup_docker/vars/Suse.yml @@ -1,2 +1,2 @@ docker_packages: - - docker=19.03.1_ce + - docker=19.03.15_ce diff --git a/test/integration/targets/setup_mysql_db/vars/Suse-py3.yml b/test/integration/targets/setup_mysql_db/vars/Suse-py3.yml index adf2754d75a..7b4993abb15 100644 --- a/test/integration/targets/setup_mysql_db/vars/Suse-py3.yml +++ b/test/integration/targets/setup_mysql_db/vars/Suse-py3.yml @@ -4,3 +4,8 @@ mysql_packages: - mariadb - python3-PyMySQL - bzip2 + +mysql_cleanup_packages: + - mariadb-errormessages + - mariadb-client + - libmariadb3 diff --git a/test/integration/targets/setup_mysql_db/vars/Suse.yml b/test/integration/targets/setup_mysql_db/vars/Suse.yml index a48a2e13302..0527e7e4a73 100644 --- a/test/integration/targets/setup_mysql_db/vars/Suse.yml +++ b/test/integration/targets/setup_mysql_db/vars/Suse.yml @@ -4,3 +4,10 @@ mysql_packages: - mariadb - python-PyMySQL - bzip2 + +mysql_cleanup_packages: + - mariadb-errormessages + - mariadb-client + - libmariadb3 + - python3-base + - python3-mysqlclient diff --git a/test/integration/targets/zypper/tasks/zypper.yml b/test/integration/targets/zypper/tasks/zypper.yml index 5806147d3d7..2a8da929f78 100644 --- a/test/integration/targets/zypper/tasks/zypper.yml +++ b/test/integration/targets/zypper/tasks/zypper.yml @@ -1,5 +1,5 @@ - name: get hello package version - shell: zypper --xml se -svx hello | grep 'name="hello"' | grep 'repository="Main Repository"' | sed 's/.*edition="\([^ ]*\)".*/\1/' + shell: zypper -x se -svx hello | grep 'name="hello"' | grep 'repository="Main Repository"' | sed 's/.*edition="\([^ ]*\)".*/\1/' register: hello_version - name: set URL of test package diff --git a/test/lib/ansible_test/_data/completion/docker.txt b/test/lib/ansible_test/_data/completion/docker.txt index d47d51a4f94..399b9e22e3f 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.14.0 python=2.7 -opensuse15 name=quay.io/ansible/opensuse15-test-container:1.14.0 python=3.6 +opensuse15py2 name=quay.io/ansible/opensuse15py2-test-container:1.21.0 python=2.7 +opensuse15 name=quay.io/ansible/opensuse15-test-container:1.21.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.8.0 python=3.6 seccomp=unconfined