From f0fcc91ac734905b9158ace0c43801fb053c1eb9 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Sun, 23 Apr 2023 18:11:25 +0200 Subject: [PATCH] zypper_repository: disable failing repository (#6415) * Disable failing repository from zypper_repository tests. * Also disable repo file for >= 15.4. * Simply disable file test for now. --- .../tasks/zypper_repository.yml | 56 ++++++++++--------- 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/tests/integration/targets/zypper_repository/tasks/zypper_repository.yml b/tests/integration/targets/zypper_repository/tasks/zypper_repository.yml index db4c3afb5df..ec362af1088 100644 --- a/tests/integration/targets/zypper_repository/tasks/zypper_repository.yml +++ b/tests/integration/targets/zypper_repository/tasks/zypper_repository.yml @@ -132,13 +132,14 @@ repo: http://download.opensuse.org/repositories/devel:/languages:/ruby/openSUSE_Leap_{{ ansible_distribution_version }}/ state: absent -- name: "Test adding a repo with custom GPG key" - community.general.zypper_repository: - name: "Apache_PHP_Modules" - repo: "http://download.opensuse.org/repositories/server:/php:/applications/openSUSE_Tumbleweed/" - priority: 100 - auto_import_keys: true - state: "present" +# FIXME: this currently fails with `Repository 'Apache_PHP_Modules' is invalid.` +# - name: "Test adding a repo with custom GPG key" +# community.general.zypper_repository: +# name: "Apache_PHP_Modules" +# repo: "http://download.opensuse.org/repositories/server:/php:/applications/openSUSE_Tumbleweed/" +# priority: 100 +# auto_import_keys: true +# state: "present" - name: add a repo by releasever community.general.zypper_repository: @@ -213,6 +214,8 @@ - remove_repo is changed # For now, the URL does not work for 15.4 +# FIXME: Try to get this working with newer versions +# (Maybe 'Uyuni' needs to be replaced with something else?) - when: ansible_distribution_version is version('15.4', '<') block: - name: add new repository via url to .repo file @@ -260,24 +263,27 @@ - "removed_by_repo_file" - "'/systemsmanagement:/Uyuni:/Stable/' not in etc_zypp_reposd.stdout" -- name: Copy test .repo file - copy: - src: 'files/systemsmanagement_Uyuni_Utils.repo' - dest: '{{ remote_tmp_dir }}' +# FIXME: THIS DOESN'T SEEM TO WORK ANYMORE WITH ANY OPENSUSE VERSION IN CI! +- when: false + block: + - name: Copy test .repo file + copy: + src: 'files/systemsmanagement_Uyuni_Utils.repo' + dest: '{{ remote_tmp_dir }}' -- name: add new repository via local path to .repo file - community.general.zypper_repository: - repo: "{{ remote_tmp_dir }}/systemsmanagement_Uyuni_Utils.repo" - state: present - register: added_by_repo_local_file + - name: add new repository via local path to .repo file + community.general.zypper_repository: + repo: "{{ remote_tmp_dir }}/systemsmanagement_Uyuni_Utils.repo" + state: present + register: added_by_repo_local_file -- name: get repository details for systemsmanagement_Uyuni_Utils from zypper - command: zypper lr systemsmanagement_Uyuni_Utils - register: get_repository_details_from_zypper_for_systemsmanagement_Uyuni_Utils + - name: get repository details for systemsmanagement_Uyuni_Utils from zypper + command: zypper lr systemsmanagement_Uyuni_Utils + register: get_repository_details_from_zypper_for_systemsmanagement_Uyuni_Utils -- name: verify adding repository via local .repo file was successful - assert: - that: - - "added_by_repo_local_file is changed" - - "get_repository_details_from_zypper_for_systemsmanagement_Uyuni_Utils.rc == 0" - - "'/systemsmanagement:/Uyuni:/Utils/' in get_repository_details_from_zypper_for_systemsmanagement_Uyuni_Utils.stdout" + - name: verify adding repository via local .repo file was successful + assert: + that: + - "added_by_repo_local_file is changed" + - "get_repository_details_from_zypper_for_systemsmanagement_Uyuni_Utils.rc == 0" + - "'/systemsmanagement:/Uyuni:/Utils/' in get_repository_details_from_zypper_for_systemsmanagement_Uyuni_Utils.stdout"