diff options
Diffstat (limited to 'test/integration/targets/flatpak_remote/tasks')
4 files changed, 14 insertions, 12 deletions
diff --git a/test/integration/targets/flatpak_remote/tasks/check_mode.yml b/test/integration/targets/flatpak_remote/tasks/check_mode.yml index 4185432586..7ce89a8c15 100644 --- a/test/integration/targets/flatpak_remote/tasks/check_mode.yml +++ b/test/integration/targets/flatpak_remote/tasks/check_mode.yml @@ -5,7 +5,7 @@ - name: Test addition of absent flatpak remote (check mode) flatpak_remote: name: flatpak-test - flatpakrepo_url: https://dl.flathub.org/repo/flathub.flatpakrepo + flatpakrepo_url: /tmp/flatpak/repo/dummy-repo.flatpakrepo state: present register: addition_result check_mode: true @@ -19,7 +19,7 @@ - name: Test non-existent idempotency of addition of absent flatpak remote (check mode) flatpak_remote: name: flatpak-test - flatpakrepo_url: https://dl.flathub.org/repo/flathub.flatpakrepo + flatpakrepo_url: /tmp/flatpak/repo/dummy-repo.flatpakrepo state: present register: double_addition_result check_mode: true @@ -57,7 +57,7 @@ - name: Test addition of present flatpak remote (check mode) flatpak_remote: name: check-mode-test-remote - flatpakrepo_url: https://dl.flathub.org/repo/flathub.flatpakrepo + flatpakrepo_url: /tmp/flatpak/repo/dummy-repo.flatpakrepo state: present register: addition_result check_mode: true diff --git a/test/integration/targets/flatpak_remote/tasks/main.yml b/test/integration/targets/flatpak_remote/tasks/main.yml index daa7d8cd17..9c3ec6d798 100644 --- a/test/integration/targets/flatpak_remote/tasks/main.yml +++ b/test/integration/targets/flatpak_remote/tasks/main.yml @@ -24,9 +24,9 @@ # executable override - name: Test executable override - flatpak: - name: org.gnome.Characters - remote: flathub + flatpak_remote: + name: irrelevant + remote: irrelevant state: present executable: nothing-that-exists ignore_errors: true @@ -53,4 +53,5 @@ method: system when: | - ansible_distribution in ('Fedora', 'Ubuntu') + ansible_distribution == 'Fedora' or + ansible_distribution == 'Ubuntu' and not ansible_distribution_major_version | int < 16 diff --git a/test/integration/targets/flatpak_remote/tasks/setup.yml b/test/integration/targets/flatpak_remote/tasks/setup.yml index b9c34c50b1..b2fd276604 100644 --- a/test/integration/targets/flatpak_remote/tasks/setup.yml +++ b/test/integration/targets/flatpak_remote/tasks/setup.yml @@ -6,11 +6,12 @@ when: ansible_distribution == 'Fedora' - block: - - name: Activate flatpak ppa on Ubuntu + - name: Activate flatpak ppa on Ubuntu versions older than 18.04/bionic apt_repository: repo: "ppa:alexlarsson/flatpak" state: present mode: 0644 + when: ansible_lsb.major_release | int < 18 - name: Install flatpak package on Ubuntu apt: @@ -19,8 +20,8 @@ when: ansible_distribution == 'Ubuntu' -- name: Install flatpak_remote for testing check mode +- name: Install flatpak remote for testing check mode flatpak_remote: name: check-mode-test-remote - flatpakrepo_url: https://dl.flathub.org/repo/flathub.flatpakrepo + flatpakrepo_url: /tmp/flatpak/repo/dummy-repo.flatpakrepo state: present diff --git a/test/integration/targets/flatpak_remote/tasks/test.yml b/test/integration/targets/flatpak_remote/tasks/test.yml index bf386c18fe..97a13f0cbd 100644 --- a/test/integration/targets/flatpak_remote/tasks/test.yml +++ b/test/integration/targets/flatpak_remote/tasks/test.yml @@ -3,7 +3,7 @@ - name: Test addition - {{ method }} flatpak_remote: name: flatpak-test - flatpakrepo_url: https://dl.flathub.org/repo/flathub.flatpakrepo + flatpakrepo_url: /tmp/flatpak/repo/dummy-repo.flatpakrepo state: present method: "{{ method }}" register: addition_result @@ -17,7 +17,7 @@ - name: Test idempotency of addition - {{ method }} flatpak_remote: name: flatpak-test - flatpakrepo_url: https://dl.flathub.org/repo/flathub.flatpakrepo + flatpakrepo_url: /tmp/flatpak/repo/dummy-repo.flatpakrepo state: present method: "{{ method }}" register: double_addition_result |