diff --git a/test/integration/targets/apt/defaults/main.yml b/test/integration/targets/apt/defaults/main.yml index b22d81bfbfb..760db98a06d 100644 --- a/test/integration/targets/apt/defaults/main.yml +++ b/test/integration/targets/apt/defaults/main.yml @@ -1 +1,2 @@ hello_old_version: 2.10-2ubuntu2 +ci_files_url: "https://ci-files.testing.ansible.com/test/integration/targets/apt" diff --git a/test/integration/targets/apt/tasks/apt.yml b/test/integration/targets/apt/tasks/apt.yml index 8dad838547b..8913c7b8541 100644 --- a/test/integration/targets/apt/tasks/apt.yml +++ b/test/integration/targets/apt/tasks/apt.yml @@ -416,7 +416,7 @@ apt: pkg=hello state=absent purge=yes - name: install deb file from URL - apt: "deb=https://ci-files.testing.ansible.com/test/integration/targets/apt/hello_{{ hello_old_version }}_{{ hello_architecture.stdout }}.deb" + apt: "deb={{ ci_files_url }}/hello_{{ hello_old_version }}_{{ hello_architecture.stdout }}.deb" register: apt_url - name: verify installation of hello @@ -602,7 +602,7 @@ # https://github.com/ansible/ansible/issues/65325 - name: Download and install old version of hello (to test allow_change_held_packages option) - apt: "deb=https://ci-files.testing.ansible.com/test/integration/targets/apt/hello_{{ hello_old_version }}_{{ hello_architecture.stdout }}.deb" + apt: "deb={{ ci_files_url }}/hello_{{ hello_old_version }}_{{ hello_architecture.stdout }}.deb" notify: - remove package hello diff --git a/test/integration/targets/apt/tasks/apt_deb_depend.yml b/test/integration/targets/apt/tasks/apt_deb_depend.yml index 0cb26b6e6d0..12f5cb2153b 100644 --- a/test/integration/targets/apt/tasks/apt_deb_depend.yml +++ b/test/integration/targets/apt/tasks/apt_deb_depend.yml @@ -8,7 +8,7 @@ - name: Install packageone from deb URL apt: - deb: https://ci-files.testing.ansible.com/test/integration/targets/apt/packageone_1.0_all.deb + deb: "{{ ci_files_url }}/packageone_1.0_all.deb" register: packageone_installed - name: Check if packagetwo is installed as part of packageone installation diff --git a/test/integration/targets/apt/tasks/url-with-deps.yml b/test/integration/targets/apt/tasks/url-with-deps.yml index 7e628c95b75..858d6d3f82a 100644 --- a/test/integration/targets/apt/tasks/url-with-deps.yml +++ b/test/integration/targets/apt/tasks/url-with-deps.yml @@ -16,7 +16,7 @@ # https://ci-files.testing.ansible.com/test/integration/targets/apt/echo-hello-source.tar.gz - name: Install deb file with dependencies from URL (check_mode) apt: - deb: https://ci-files.testing.ansible.com/test/integration/targets/apt/echo-hello_1.0_all.deb + deb: "{{ ci_files_url }}/echo-hello_1.0_all.deb" check_mode: true register: apt_url_deps_check_mode @@ -33,7 +33,7 @@ - name: Install deb file with dependencies from URL (for real this time) apt: - deb: https://ci-files.testing.ansible.com/test/integration/targets/apt/echo-hello_1.0_all.deb + deb: "{{ ci_files_url }}/echo-hello_1.0_all.deb" register: apt_url_deps - name: check to make sure we installed the package diff --git a/test/integration/targets/apt_key/defaults/main.yml b/test/integration/targets/apt_key/defaults/main.yml new file mode 100644 index 00000000000..6fdc0698704 --- /dev/null +++ b/test/integration/targets/apt_key/defaults/main.yml @@ -0,0 +1 @@ +ci_files_url: "https://ci-files.testing.ansible.com/test/integration/targets/apt_key" diff --git a/test/integration/targets/apt_key/tasks/apt_key_binary.yml b/test/integration/targets/apt_key/tasks/apt_key_binary.yml index b120bd57a64..e7a8b575d90 100644 --- a/test/integration/targets/apt_key/tasks/apt_key_binary.yml +++ b/test/integration/targets/apt_key/tasks/apt_key_binary.yml @@ -2,7 +2,7 @@ - name: Ensure import of binary key downloaded using URLs works apt_key: - url: https://ci-files.testing.ansible.com/test/integration/targets/apt_key/apt-key-example-binary.gpg + url: "{{ ci_files_url }}/apt-key-example-binary.gpg" register: apt_key_binary_test - name: Validate the results diff --git a/test/integration/targets/apt_key/tasks/apt_key_inline_data.yml b/test/integration/targets/apt_key/tasks/apt_key_inline_data.yml index 1558eac31a1..fde2edc1749 100644 --- a/test/integration/targets/apt_key/tasks/apt_key_inline_data.yml +++ b/test/integration/targets/apt_key/tasks/apt_key_inline_data.yml @@ -1,5 +1,5 @@ - name: "Ensure import of a deliberately corrupted downloaded GnuPG binary key results in an 'inline data' occurrence in the message" apt_key: - url: https://ci-files.testing.ansible.com/test/integration/targets/apt_key/apt-key-corrupt-zeros-2k.gpg + url: "{{ ci_files_url }}/apt-key-corrupt-zeros-2k.gpg" register: gpg_inline_result failed_when: "not ('inline data' in gpg_inline_result.msg)" diff --git a/test/integration/targets/apt_key/tasks/file.yml b/test/integration/targets/apt_key/tasks/file.yml index c22f3a40279..50794e24017 100644 --- a/test/integration/targets/apt_key/tasks/file.yml +++ b/test/integration/targets/apt_key/tasks/file.yml @@ -1,6 +1,6 @@ - name: Get Fedora GPG Key get_url: - url: https://ci-files.testing.ansible.com/test/integration/targets/apt_key/fedora.gpg + url: "{{ ci_files_url }}/fedora.gpg" dest: /tmp/fedora.gpg - name: Ensure clean slate @@ -42,7 +42,7 @@ - name: add key from url apt_key: - url: https://ci-files.testing.ansible.com/test/integration/targets/apt_key/fedora.gpg + url: "{{ ci_files_url }}/fedora.gpg" register: apt_key_url - name: verify key from url diff --git a/test/integration/targets/deb822_repository/defaults/main.yml b/test/integration/targets/deb822_repository/defaults/main.yml new file mode 100644 index 00000000000..6fdc0698704 --- /dev/null +++ b/test/integration/targets/deb822_repository/defaults/main.yml @@ -0,0 +1 @@ +ci_files_url: "https://ci-files.testing.ansible.com/test/integration/targets/apt_key" diff --git a/test/integration/targets/deb822_repository/tasks/test.yml b/test/integration/targets/deb822_repository/tasks/test.yml index 6f8a5204e1c..75fa0610bab 100644 --- a/test/integration/targets/deb822_repository/tasks/test.yml +++ b/test/integration/targets/deb822_repository/tasks/test.yml @@ -179,7 +179,7 @@ - main - contrib - non-free - signed_by: https://ci-files.testing.ansible.com/test/integration/targets/apt_key/apt-key-example-binary.gpg + signed_by: "{{ ci_files_url }}/apt-key-example-binary.gpg" register: signed_by_url - assert: diff --git a/test/integration/targets/dnf/defaults/main.yml b/test/integration/targets/dnf/defaults/main.yml new file mode 100644 index 00000000000..02a72bee549 --- /dev/null +++ b/test/integration/targets/dnf/defaults/main.yml @@ -0,0 +1,2 @@ +ci_files_url: "https://ci-files.testing.ansible.com/test/integration/targets/dnf" +updateinfo_repo: "https://ci-files.testing.ansible.com/test/integration/targets/setup_rpm_repo/repo-with-updateinfo" diff --git a/test/integration/targets/dnf/tasks/dnf.yml b/test/integration/targets/dnf/tasks/dnf.yml index 6855709f016..21a90cf87dc 100644 --- a/test/integration/targets/dnf/tasks/dnf.yml +++ b/test/integration/targets/dnf/tasks/dnf.yml @@ -501,7 +501,7 @@ - name: try to install from non existing url dnf: - name: https://ci-files.testing.ansible.com/test/integration/targets/dnf/non-existing-1.0.0.fc26.noarch.rpm + name: "{{ ci_files_url }}/non-existing-1.0.0.fc26.noarch.rpm" state: present register: dnf_result ignore_errors: yes @@ -607,7 +607,7 @@ - name: try to install not compatible arch rpm, should fail dnf: - name: https://ci-files.testing.ansible.com/test/integration/targets/dnf/banner-1.3.4-3.el7.ppc64le.rpm + name: "{{ ci_files_url }}/banner-1.3.4-3.el7.ppc64le.rpm" state: present register: dnf_result ignore_errors: True diff --git a/test/integration/targets/dnf/tasks/filters.yml b/test/integration/targets/dnf/tasks/filters.yml index 1ce9b6687f7..ebcd2df0acf 100644 --- a/test/integration/targets/dnf/tasks/filters.yml +++ b/test/integration/targets/dnf/tasks/filters.yml @@ -1,9 +1,6 @@ # We have a test repo set up with a valid updateinfo.xml which is referenced # from its repomd.xml. - block: - - set_fact: - updateinfo_repo: https://ci-files.testing.ansible.com/test/integration/targets/setup_rpm_repo/repo-with-updateinfo - - name: Install the test repo yum_repository: name: test-repo-with-updateinfo diff --git a/test/integration/targets/dnf/tasks/filters_check_mode.yml b/test/integration/targets/dnf/tasks/filters_check_mode.yml index c931c07236b..cb751345830 100644 --- a/test/integration/targets/dnf/tasks/filters_check_mode.yml +++ b/test/integration/targets/dnf/tasks/filters_check_mode.yml @@ -1,9 +1,6 @@ # We have a test repo set up with a valid updateinfo.xml which is referenced # from its repomd.xml. - block: - - set_fact: - updateinfo_repo: https://ci-files.testing.ansible.com/test/integration/targets/setup_rpm_repo/repo-with-updateinfo - - name: Install the test repo yum_repository: name: test-repo-with-updateinfo diff --git a/test/integration/targets/dpkg_selections/defaults/main.yaml b/test/integration/targets/dpkg_selections/defaults/main.yaml index b22d81bfbfb..4051f621484 100644 --- a/test/integration/targets/dpkg_selections/defaults/main.yaml +++ b/test/integration/targets/dpkg_selections/defaults/main.yaml @@ -1 +1,2 @@ hello_old_version: 2.10-2ubuntu2 +ci_files_url: https://ci-files.testing.ansible.com/test/integration/targets/dpkg_selections diff --git a/test/integration/targets/dpkg_selections/tasks/dpkg_selections.yaml b/test/integration/targets/dpkg_selections/tasks/dpkg_selections.yaml index 026b2575f16..2ed69634ce5 100644 --- a/test/integration/targets/dpkg_selections/tasks/dpkg_selections.yaml +++ b/test/integration/targets/dpkg_selections/tasks/dpkg_selections.yaml @@ -3,7 +3,7 @@ register: default_arch - name: download and install old version of hello - apt: "deb=https://ci-files.testing.ansible.com/test/integration/targets/dpkg_selections/hello_{{ hello_old_version }}_{{ default_arch.stdout }}.deb" + apt: "deb={{ ci_files_url }}/hello_{{ hello_old_version }}_{{ default_arch.stdout }}.deb" - name: freeze version for hello dpkg_selections: diff --git a/test/integration/targets/setup_win_printargv/defaults/main.yml b/test/integration/targets/setup_win_printargv/defaults/main.yml new file mode 100644 index 00000000000..5dc0fb19ae4 --- /dev/null +++ b/test/integration/targets/setup_win_printargv/defaults/main.yml @@ -0,0 +1 @@ +ci_files_url: "https://ci-files.testing.ansible.com/test/integration/targets/setup_win_printargv" diff --git a/test/integration/targets/setup_win_printargv/tasks/main.yml b/test/integration/targets/setup_win_printargv/tasks/main.yml index 3924931fc2a..3608dcb8001 100644 --- a/test/integration/targets/setup_win_printargv/tasks/main.yml +++ b/test/integration/targets/setup_win_printargv/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: download the PrintArgv.exe binary to temp location win_get_url: - url: https://ci-files.testing.ansible.com/test/integration/targets/setup_win_printargv/PrintArgv.exe + url: "{{ ci_files_url }}/PrintArgv.exe" dest: '{{ remote_tmp_dir }}\PrintArgv.exe' - name: set fact containing PrintArgv binary path diff --git a/test/integration/targets/unarchive/defaults/main.yml b/test/integration/targets/unarchive/defaults/main.yml new file mode 100644 index 00000000000..eaca6835db8 --- /dev/null +++ b/test/integration/targets/unarchive/defaults/main.yml @@ -0,0 +1 @@ +ci_files_url: "https://ci-files.testing.ansible.com/test/integration/targets/apt" diff --git a/test/integration/targets/unarchive/tasks/test_download.yml b/test/integration/targets/unarchive/tasks/test_download.yml index a133bf51c71..d417a977a8e 100644 --- a/test/integration/targets/unarchive/tasks/test_download.yml +++ b/test/integration/targets/unarchive/tasks/test_download.yml @@ -8,7 +8,7 @@ block: - name: unarchive a tar from an URL unarchive: - src: "https://ci-files.testing.ansible.com/test/integration/targets/apt/echo-hello-source.tar.gz" + src: "{{ ci_files_url }}/echo-hello-source.tar.gz" dest: "{{ remote_tmp_dir }}/test-unarchive-tar-gz" mode: "0700" remote_src: yes