diff --git a/test/integration/targets/async/tasks/main.yml b/test/integration/targets/async/tasks/main.yml index c8c12f6d601..255e7104ae2 100644 --- a/test/integration/targets/async/tasks/main.yml +++ b/test/integration/targets/async/tasks/main.yml @@ -320,6 +320,7 @@ - name: run async poll callback test playbook command: ansible-playbook {{ role_path }}/callback_test.yml + delegate_to: localhost register: callback_output - assert: diff --git a/test/integration/targets/copy/tasks/main.yml b/test/integration/targets/copy/tasks/main.yml index e02c02327f2..ae7ef753a6d 100644 --- a/test/integration/targets/copy/tasks/main.yml +++ b/test/integration/targets/copy/tasks/main.yml @@ -27,6 +27,7 @@ chdir: '{{role_path}}/files/subdir/subdir1' warn: no with_dict: "{{ symlinks }}" + delegate_to: localhost - name: Create remote unprivileged remote user user: @@ -78,6 +79,7 @@ when: ansible_os_family == 'RedHat' and ansible_selinux.get('mode') == 'enforcing' - import_tasks: no_log.yml + delegate_to: localhost - import_tasks: check_mode.yml diff --git a/test/integration/targets/git/tasks/archive.yml b/test/integration/targets/git/tasks/archive.yml index 574559ef28c..18b9dff350a 100644 --- a/test/integration/targets/git/tasks/archive.yml +++ b/test/integration/targets/git/tasks/archive.yml @@ -119,6 +119,7 @@ unarchive: src: '{{ checkout_dir }}/test_role.{{ item }}' dest: '{{ checkout_dir }}/{{ git_archive_prefix }}.{{ item }}' + remote_src: yes with_items: "{{ git_archive_extensions[ansible_os_family ~ ansible_distribution_major_version | default('default') ] | default(git_archive_extensions.default) }}" - name: ARCHIVE | Check if prefix directory exists in what's extracted diff --git a/test/integration/targets/setup_cron/defaults/main.yml b/test/integration/targets/setup_cron/defaults/main.yml index e4b0123da2a..a6d1965fd26 100644 --- a/test/integration/targets/setup_cron/defaults/main.yml +++ b/test/integration/targets/setup_cron/defaults/main.yml @@ -1 +1 @@ -remote_dir: "{{ lookup('env', 'OUTPUT_DIR') }}" +remote_dir: "{{ remote_tmp_dir }}" diff --git a/test/integration/targets/setup_cron/meta/main.yml b/test/integration/targets/setup_cron/meta/main.yml new file mode 100644 index 00000000000..1810d4bec98 --- /dev/null +++ b/test/integration/targets/setup_cron/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: + - setup_remote_tmp_dir diff --git a/test/integration/targets/unarchive/tasks/test_include.yml b/test/integration/targets/unarchive/tasks/test_include.yml index 3ed30fa3f43..04842e0ecdb 100644 --- a/test/integration/targets/unarchive/tasks/test_include.yml +++ b/test/integration/targets/unarchive/tasks/test_include.yml @@ -15,6 +15,7 @@ unarchive: src: "{{ remote_tmp_dir }}/test-unarchive.zip" dest: "{{ remote_tmp_dir }}/include-zip" + remote_src: yes include: - FOO-UNAR.TXT @@ -39,6 +40,7 @@ unarchive: src: "{{ remote_tmp_dir }}/test-unarchive-multi.tar" dest: "{{ remote_tmp_dir }}/include-tar" + remote_src: yes include: - foo-unarchive-777.txt @@ -61,6 +63,7 @@ unarchive: src: "{{ remote_tmp_dir }}/test-unarchive-multi.tar" dest: "{{ remote_tmp_dir }}/include-tar" + remote_src: yes include: - foo-unarchive-777.txt exclude: diff --git a/test/integration/targets/yum_repository/tasks/main.yml b/test/integration/targets/yum_repository/tasks/main.yml index d81957755c2..96f7d3f9031 100644 --- a/test/integration/targets/yum_repository/tasks/main.yml +++ b/test/integration/targets/yum_repository/tasks/main.yml @@ -106,6 +106,11 @@ module_hotfixes: no register: test_repo_add1 + - name: Get repo file contents + slurp: + path: "{{ '/etc/yum.repos.d/' ~ yum_repository_test_repo.name ~ '2.repo' }}" + register: slurp + - name: check that options are correctly getting written to the repo file assert: that: @@ -116,8 +121,7 @@ - "'keepalive = 0' in repo_file_contents" - "'module_hotfixes = 0' in repo_file_contents" vars: - repo_file: "{{ '/etc/yum.repos.d/' ~ yum_repository_test_repo.name ~ '2.repo' }}" - repo_file_contents: "{{ lookup('file', repo_file) }}" + repo_file_contents: "{{ slurp.content | b64decode }}" - name: check new config doesn't change (Idempotant) yum_repository: @@ -175,6 +179,11 @@ - ddd notify: remove listtest repo + - name: Get repo file + slurp: + path: /etc/yum.repos.d/listtest.repo + register: slurp + - name: Assert that lists were properly inserted assert: that: @@ -185,6 +194,6 @@ - "'aaa bbb' in repofile" - "'ccc ddd' in repofile" vars: - repofile: "{{ lookup('file', '/etc/yum.repos.d/listtest.repo') }}" + repofile: "{{ slurp.content | b64decode }}" url_hostname: "{{ yum_repository_test_repo.baseurl | urlsplit('hostname') }}" url_hostname2: "{{ url_hostname | replace('download[0-9]?\\.', 'download2\\.', 1) }}"