Merge b879e420d9 into 7b4d4ed672

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"

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
 

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

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

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"

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

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)"

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

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"

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:

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"

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

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

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

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

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:

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"

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

test/integration/targets/unarchive/defaults/main.yml

@@ -0,0 +1 @@
+ci_files_url: "https://ci-files.testing.ansible.com/test/integration/targets/apt"

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