diff options
| author | James E. Blair <jim@acmegating.com> | 2022-04-11 17:53:14 -0700 |
|---|---|---|
| committer | James E. Blair <jim@acmegating.com> | 2022-04-13 14:17:04 -0700 |
| commit | a28ca2f2401f221b8e26501bf9fcb439fdf71d53 (patch) | |
| tree | b5ce6ba30a820399cfc24f24f9b6c0aa2ab15acf | |
| parent | aec4019ca7a7e1cdd732b366b0a431a873b36d5b (diff) | |
| download | zuul-a28ca2f2401f221b8e26501bf9fcb439fdf71d53.tar.gz | |
Remove unused remote module tests
These tests verify the behavior of the restricted Ansible modules which
are being removed, and are therefore no longer necessary.
Change-Id: I5a171739b9e993af605aee981cb59f520bc1c6ba
132 files changed, 1 insertions, 1074 deletions
diff --git a/tests/fixtures/config/remote-action-modules/git/common-config/roles/common-copy/files/common-file b/tests/fixtures/config/remote-action-modules/git/common-config/roles/common-copy/files/common-file deleted file mode 100644 index f73f3093f..000000000 --- a/tests/fixtures/config/remote-action-modules/git/common-config/roles/common-copy/files/common-file +++ /dev/null @@ -1 +0,0 @@ -file diff --git a/tests/fixtures/config/remote-action-modules/git/common-config/roles/common-copy/tasks/main.yaml b/tests/fixtures/config/remote-action-modules/git/common-config/roles/common-copy/tasks/main.yaml deleted file mode 100644 index 34b5cd99b..000000000 --- a/tests/fixtures/config/remote-action-modules/git/common-config/roles/common-copy/tasks/main.yaml +++ /dev/null @@ -1,9 +0,0 @@ -- name: Create a destination directory for copied files - tempfile: - state: directory - register: destdir - -- name: Common copy - copy: - src: common-file - dest: "{{destdir.path}}/common-file" diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/assemble-bad-dir-with-symlink.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/assemble-bad-dir-with-symlink.yaml deleted file mode 100644 index 855151532..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/assemble-bad-dir-with-symlink.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - roles: - - role: assemble-test - src_file: dir-symlink diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/assemble-bad-symlink.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/assemble-bad-symlink.yaml deleted file mode 100644 index 597aa4086..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/assemble-bad-symlink.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - roles: - - role: assemble-test - src_file: symlink diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/assemble-bad.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/assemble-bad.yaml deleted file mode 100644 index 9c659f1b7..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/assemble-bad.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - roles: - - role: assemble-test - src_file: /opt/assemble diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/assemble-delegate.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/assemble-delegate.yaml deleted file mode 100644 index 2a8859f8f..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/assemble-delegate.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- hosts: all - roles: - - assemble-test-delegate diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/assemble-good.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/assemble-good.yaml deleted file mode 100644 index 96213f025..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/assemble-good.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - roles: - - role: assemble-test - src_file: dir diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/assemble-localhost.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/assemble-localhost.yaml deleted file mode 100644 index 082a75155..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/assemble-localhost.yaml +++ /dev/null @@ -1,11 +0,0 @@ -- hosts: localhost - roles: - - assemble-test-localhost - -- hosts: 127.0.0.1 - roles: - - assemble-test-localhost - -- hosts: "::1" - roles: - - assemble-test-localhost diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/copy-bad-dir-with-symlink.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/copy-bad-dir-with-symlink.yaml deleted file mode 100644 index 5a7172b1b..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/copy-bad-dir-with-symlink.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - roles: - - role: copy-test - src_file: dir-symlink diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/copy-bad-symlink.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/copy-bad-symlink.yaml deleted file mode 100644 index d53845a20..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/copy-bad-symlink.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - roles: - - role: copy-test - src_file: symlink diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/copy-bad.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/copy-bad.yaml deleted file mode 100644 index d36e0cf26..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/copy-bad.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - roles: - - role: copy-test - src_file: /opt/file diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/copy-delegate.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/copy-delegate.yaml deleted file mode 100644 index 2241bd872..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/copy-delegate.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- hosts: all - roles: - - copy-test-delegate diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/copy-good.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/copy-good.yaml deleted file mode 100644 index 2277705e8..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/copy-good.yaml +++ /dev/null @@ -1,5 +0,0 @@ -- hosts: all - roles: - - common-copy - - role: copy-test - src_file: file diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/copy-localhost.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/copy-localhost.yaml deleted file mode 100644 index 3093687be..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/copy-localhost.yaml +++ /dev/null @@ -1,11 +0,0 @@ -- hosts: localhost - roles: - - copy-test-localhost - -- hosts: 127.0.0.1 - roles: - - copy-test-localhost - -- hosts: "::1" - roles: - - copy-test-localhost diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/includevars-bad-dir-symlink.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/includevars-bad-dir-symlink.yaml deleted file mode 100644 index b41038156..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/includevars-bad-dir-symlink.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - roles: - - role: includevarsdir-test - src_file: symlink diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/includevars-bad-dir-with-double-symlink.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/includevars-bad-dir-with-double-symlink.yaml deleted file mode 100644 index 7127af01c..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/includevars-bad-dir-with-double-symlink.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - roles: - - role: includevarsdir-test - src_file: dir-double-symlink diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/includevars-bad-dir-with-symlink.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/includevars-bad-dir-with-symlink.yaml deleted file mode 100644 index d771a8fe0..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/includevars-bad-dir-with-symlink.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - roles: - - role: includevarsdir-test - src_file: dir-symlink diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/includevars-bad-dir.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/includevars-bad-dir.yaml deleted file mode 100644 index b79618ce6..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/includevars-bad-dir.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - roles: - - role: includevarsdir-test - src_file: /opt/vars diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/includevars-bad-symlink.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/includevars-bad-symlink.yaml deleted file mode 100644 index b2a663ab0..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/includevars-bad-symlink.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - roles: - - role: includevars-test - src_file: symlink.yaml diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/includevars-bad.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/includevars-bad.yaml deleted file mode 100644 index 5e8e99f97..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/includevars-bad.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - roles: - - role: includevars-test - src_file: /opt/vars.yaml diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/includevars-good-dir.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/includevars-good-dir.yaml deleted file mode 100644 index 84bb4070e..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/includevars-good-dir.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - roles: - - role: includevarsdir-test - src_file: dir diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/includevars-good.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/includevars-good.yaml deleted file mode 100644 index 8addb1263..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/includevars-good.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - roles: - - role: includevars-test - src_file: vars.yaml diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/known-hosts-bad.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/known-hosts-bad.yaml deleted file mode 100644 index f355983fc..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/known-hosts-bad.yaml +++ /dev/null @@ -1,8 +0,0 @@ -- hosts: all - tasks: - - name: Add fake known_hosts entry - delegate_to: localhost - known_hosts: - name: fake - path: /root/.ssh/known_hosts - key: fake ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOOaqWfpmnMiCYaLUq0ugyQ6OUIvtPzkOqLTG03HXxU9 diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/known-hosts-delegate.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/known-hosts-delegate.yaml deleted file mode 100644 index 14cc21bd4..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/known-hosts-delegate.yaml +++ /dev/null @@ -1,7 +0,0 @@ -- hosts: all - tasks: - - name: Add fake known_hosts entry - delegate_to: localhost - known_hosts: - name: fake - key: fake ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOOaqWfpmnMiCYaLUq0ugyQ6OUIvtPzkOqLTG03HXxU9 diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/known-hosts-good.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/known-hosts-good.yaml deleted file mode 100644 index a2f425ee4..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/known-hosts-good.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- hosts: all - tasks: - - name: Add fake known_hosts entry - known_hosts: - name: fake - key: fake ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOOaqWfpmnMiCYaLUq0ugyQ6OUIvtPzkOqLTG03HXxU9 diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/known-hosts-localhost.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/known-hosts-localhost.yaml deleted file mode 100644 index 1875f36cb..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/known-hosts-localhost.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- hosts: localhost - tasks: - - name: Add fake known_hosts entry - known_hosts: - name: fake - key: fake ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOOaqWfpmnMiCYaLUq0ugyQ6OUIvtPzkOqLTG03HXxU9 diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/patch-bad-symlink.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/patch-bad-symlink.yaml deleted file mode 100644 index 956ae7b5b..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/patch-bad-symlink.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - roles: - - role: patch-test - src_file: symlink diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/patch-bad.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/patch-bad.yaml deleted file mode 100644 index de4a6fd66..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/patch-bad.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - roles: - - role: patch-test - src_file: /opt/patch diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/patch-delegate.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/patch-delegate.yaml deleted file mode 100644 index ed563025f..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/patch-delegate.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- hosts: all - roles: - - patch-test-delegate diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/patch-good.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/patch-good.yaml deleted file mode 100644 index fcf0c8144..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/patch-good.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - roles: - - role: patch-test - src_file: patch diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/patch-localhost.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/patch-localhost.yaml deleted file mode 100644 index 15a24c742..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/patch-localhost.yaml +++ /dev/null @@ -1,11 +0,0 @@ -- hosts: localhost - roles: - - patch-test-localhost - -- hosts: 127.0.0.1 - roles: - - patch-test-localhost - -- hosts: "::1" - roles: - - patch-test-localhost diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/raw-delegate.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/raw-delegate.yaml deleted file mode 100644 index 0768287e9..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/raw-delegate.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- hosts: all - roles: - - raw-test-delegate diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/raw-good.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/raw-good.yaml deleted file mode 100644 index fc7b30121..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/raw-good.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - tasks: - - name: Some raw command - raw: echo 123 diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/raw-localhost.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/raw-localhost.yaml deleted file mode 100644 index 8c2970229..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/raw-localhost.yaml +++ /dev/null @@ -1,11 +0,0 @@ -- hosts: localhost - roles: - - raw-test-localhost - -- hosts: 127.0.0.1 - roles: - - raw-test-localhost - -- hosts: "::1" - roles: - - raw-test-localhost diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/assemble-test-delegate/files/dir/resolv.conf b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/assemble-test-delegate/files/dir/resolv.conf deleted file mode 100644 index 5626abf0f..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/assemble-test-delegate/files/dir/resolv.conf +++ /dev/null @@ -1 +0,0 @@ -one diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/assemble-test-delegate/tasks/assemble-delegate.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/assemble-test-delegate/tasks/assemble-delegate.yaml deleted file mode 100644 index 015982660..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/assemble-test-delegate/tasks/assemble-delegate.yaml +++ /dev/null @@ -1,14 +0,0 @@ -- name: Assemble - assemble: - src: dir - dest: /opt/assemble-dest - remote_src: no - delegate_to: "{{ item }}" - ignore_errors: true - register: result - -- assert: - that: - - "result.failed == true" - - "'Accessing files from outside the working dir' in result.msg" - msg: Assemble must fail due to accessing files outside the working dir diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/assemble-test-delegate/tasks/main.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/assemble-test-delegate/tasks/main.yaml deleted file mode 100644 index 57c186b06..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/assemble-test-delegate/tasks/main.yaml +++ /dev/null @@ -1,22 +0,0 @@ -- include: assemble-delegate.yaml - with_items: - - ::1 - - 127.0.0.1 - - localhost - -- name: Define target dir - set_fact: - targetdir: "{{ zuul.executor.work_root }}/assemble-target" - -- name: Create target dir - file: - state: directory - path: "{{ targetdir }}" - delegate_to: localhost - -- name: Assemble to safe local path - assemble: - src: dir - dest: "{{ targetdir }}/assemble-dest.conf" - remote_src: no - delegate_to: localhost diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/assemble-test-localhost/files/dir/resolv.conf b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/assemble-test-localhost/files/dir/resolv.conf deleted file mode 100644 index 5626abf0f..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/assemble-test-localhost/files/dir/resolv.conf +++ /dev/null @@ -1 +0,0 @@ -one diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/assemble-test-localhost/tasks/main.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/assemble-test-localhost/tasks/main.yaml deleted file mode 100644 index afe156f46..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/assemble-test-localhost/tasks/main.yaml +++ /dev/null @@ -1,13 +0,0 @@ -- name: Assemble - assemble: - src: dir - dest: /opt/assemble-dest - remote_src: no - ignore_errors: true - register: result - -- assert: - that: - - "result.failed == true" - - "'Accessing files from outside the working dir' in result.msg" - msg: Assemble must fail due to accessing files outside the working dir diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/assemble-test/files/dir-symlink/one b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/assemble-test/files/dir-symlink/one deleted file mode 100644 index 33e34a832..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/assemble-test/files/dir-symlink/one +++ /dev/null @@ -1 +0,0 @@ -symlink: /opt/file diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/assemble-test/files/dir/resolv.conf b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/assemble-test/files/dir/resolv.conf deleted file mode 100644 index 5626abf0f..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/assemble-test/files/dir/resolv.conf +++ /dev/null @@ -1 +0,0 @@ -one diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/assemble-test/files/symlink b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/assemble-test/files/symlink deleted file mode 100644 index 2b1ef2c45..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/assemble-test/files/symlink +++ /dev/null @@ -1 +0,0 @@ -symlink: /opt/assemble diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/assemble-test/tasks/main.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/assemble-test/tasks/main.yaml deleted file mode 100644 index fce6df52c..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/assemble-test/tasks/main.yaml +++ /dev/null @@ -1,10 +0,0 @@ -- name: Create a destination directory for copied files - tempfile: - state: directory - register: destdir - -- name: Assemble - assemble: - src: "{{src_file}}" - dest: "{{destdir.path}}/copy" - remote_src: no diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/copy-test-delegate/files/file b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/copy-test-delegate/files/file deleted file mode 100644 index e69de29bb..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/copy-test-delegate/files/file +++ /dev/null diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/copy-test-delegate/tasks/copy-delegate.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/copy-test-delegate/tasks/copy-delegate.yaml deleted file mode 100644 index 831bcd374..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/copy-test-delegate/tasks/copy-delegate.yaml +++ /dev/null @@ -1,13 +0,0 @@ -- name: Copy - copy: - src: file - dest: /opt/copy-dest - delegate_to: "{{ item }}" - register: result - ignore_errors: true - -- assert: - that: - - "result.failed == true" - - "'Accessing files from outside the working dir' in result.msg" - msg: Copy must fail due to accessing files outside the working dir diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/copy-test-delegate/tasks/main.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/copy-test-delegate/tasks/main.yaml deleted file mode 100644 index 116ed2b64..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/copy-test-delegate/tasks/main.yaml +++ /dev/null @@ -1,27 +0,0 @@ -- include: copy-delegate.yaml - with_items: - - ::1 - - 127.0.0.1 - - localhost - -- name: Define target dir - set_fact: - targetdir: "{{ zuul.executor.work_root }}/copy-target" - -- name: Create target dir - file: - state: directory - path: "{{ targetdir }}" - delegate_to: localhost - -- name: Copy file into safe path - copy: - src: file - dest: "{{ targetdir }}/dest-file" - delegate_to: localhost - -- name: Copy file into safe directory - copy: - src: file - dest: "{{ targetdir }}/dest-dir/" - delegate_to: localhost diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/copy-test-localhost/files/file b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/copy-test-localhost/files/file deleted file mode 100644 index e69de29bb..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/copy-test-localhost/files/file +++ /dev/null diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/copy-test-localhost/tasks/main.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/copy-test-localhost/tasks/main.yaml deleted file mode 100644 index 23b7cbefb..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/copy-test-localhost/tasks/main.yaml +++ /dev/null @@ -1,12 +0,0 @@ -- name: Copy - copy: - src: file - dest: /opt/copy-dest - register: result - ignore_errors: true - -- assert: - that: - - "result.failed == true" - - "'Accessing files from outside the working dir' in result.msg" - msg: Copy must fail due to accessing files outside the working dir diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/copy-test/files/dir-symlink/symlink b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/copy-test/files/dir-symlink/symlink deleted file mode 100644 index b21f8f817..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/copy-test/files/dir-symlink/symlink +++ /dev/null @@ -1 +0,0 @@ -symlink: /opt/dir diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/copy-test/files/file b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/copy-test/files/file deleted file mode 100644 index e69de29bb..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/copy-test/files/file +++ /dev/null diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/copy-test/files/symlink b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/copy-test/files/symlink deleted file mode 100644 index 33e34a832..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/copy-test/files/symlink +++ /dev/null @@ -1 +0,0 @@ -symlink: /opt/file diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/copy-test/tasks/main.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/copy-test/tasks/main.yaml deleted file mode 100644 index c654e4e61..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/copy-test/tasks/main.yaml +++ /dev/null @@ -1,9 +0,0 @@ -- name: Create a destination directory for copied files - tempfile: - state: directory - register: destdir - -- name: Copy - copy: - src: "{{src_file}}" - dest: "{{destdir.path}}/copy" diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevars-test/tasks/main.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevars-test/tasks/main.yaml deleted file mode 100644 index fcef1ff2e..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevars-test/tasks/main.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- name: Include vars - include_vars: "{{src_file}}" diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevars-test/vars/symlink.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevars-test/vars/symlink.yaml deleted file mode 100644 index a0b14fc6a..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevars-test/vars/symlink.yaml +++ /dev/null @@ -1 +0,0 @@ -symlink: /opt/vars.yaml diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevars-test/vars/vars.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevars-test/vars/vars.yaml deleted file mode 100644 index e69de29bb..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevars-test/vars/vars.yaml +++ /dev/null diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/tasks/main.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/tasks/main.yaml deleted file mode 100644 index 6768290a4..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/tasks/main.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- name: Include vars - include_vars: - dir: "{{src_file}}" diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/dir-double-symlink/double-symlink-sidekick b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/dir-double-symlink/double-symlink-sidekick deleted file mode 100644 index 62583effa..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/dir-double-symlink/double-symlink-sidekick +++ /dev/null @@ -1 +0,0 @@ -symlink: ../double-symlink-sidekick diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/dir-double-symlink/one.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/dir-double-symlink/one.yaml deleted file mode 100644 index 09189d3c2..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/dir-double-symlink/one.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -first_var: one diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/dir-symlink/one.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/dir-symlink/one.yaml deleted file mode 100644 index 09189d3c2..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/dir-symlink/one.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -first_var: one diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/dir-symlink/two.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/dir-symlink/two.yaml deleted file mode 100644 index a0b14fc6a..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/dir-symlink/two.yaml +++ /dev/null @@ -1 +0,0 @@ -symlink: /opt/vars.yaml diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/dir/sub/recursive-link b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/dir/sub/recursive-link deleted file mode 100644 index 477759422..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/dir/sub/recursive-link +++ /dev/null @@ -1 +0,0 @@ -symlink: .. diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/dir/vars.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/dir/vars.yaml deleted file mode 100644 index e69de29bb..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/dir/vars.yaml +++ /dev/null diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/double-symlink-sidekick/vars.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/double-symlink-sidekick/vars.yaml deleted file mode 100644 index a0b14fc6a..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/double-symlink-sidekick/vars.yaml +++ /dev/null @@ -1 +0,0 @@ -symlink: /opt/vars.yaml diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/symlink b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/symlink deleted file mode 100644 index 5ec4b036d..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/symlink +++ /dev/null @@ -1 +0,0 @@ -symlink: /opt/vars diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test-delegate/files/patch b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test-delegate/files/patch deleted file mode 100644 index aa2c60eb0..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test-delegate/files/patch +++ /dev/null @@ -1,7 +0,0 @@ -diff --git a/readme.txt b/readme.txt -index 24308cb..b07f0ed 100644 ---- a/readme.txt -+++ b/readme.txt -@@ -1 +1 @@ --This is a readme -+This is a README diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test-delegate/files/readme.txt b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test-delegate/files/readme.txt deleted file mode 100644 index 24308cb38..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test-delegate/files/readme.txt +++ /dev/null @@ -1 +0,0 @@ -This is a readme diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test-delegate/tasks/main.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test-delegate/tasks/main.yaml deleted file mode 100644 index 759743f94..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test-delegate/tasks/main.yaml +++ /dev/null @@ -1,41 +0,0 @@ -- include: patch-delegate.yaml - with_items: - - ::1 - - 127.0.0.1 - - localhost - -- name: Define target dir - set_fact: - targetdir: "{{ zuul.executor.work_root }}/patch-target" - -- name: Create target dir - file: - state: directory - path: "{{ targetdir }}" - delegate_to: localhost - -- name: Copy readme - copy: - src: readme.txt - dest: "{{ targetdir }}/readme.txt" - delegate_to: localhost - -- name: Patch in safe path using basedir - patch: - src: "patch" - basedir: "{{ targetdir }}" - strip: 1 - delegate_to: localhost - -- name: Copy readme again - copy: - src: readme.txt - dest: "{{ targetdir }}/readme.txt" - delegate_to: localhost - -- name: Patch in safe path using dest - patch: - src: "patch" - dest: "{{ targetdir }}/readme.txt" - strip: 1 - delegate_to: localhost diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test-delegate/tasks/patch-delegate.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test-delegate/tasks/patch-delegate.yaml deleted file mode 100644 index 44ebca3ca..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test-delegate/tasks/patch-delegate.yaml +++ /dev/null @@ -1,29 +0,0 @@ -- name: Patch with basedir - patch: - src: patch - basedir: "/opt/patch-dest" - strip: 1 - delegate_to: "{{ item }}" - register: result - ignore_errors: true - -- assert: - that: - - "result.failed == true" - - "'Accessing files from outside the working dir' in result.msg" - msg: Patch must fail due to accessing files outside the working dir - -- name: Patch with dest - patch: - src: patch - dest: "/opt/patch-dest/readme" - strip: 1 - delegate_to: "{{ item }}" - register: result - ignore_errors: true - -- assert: - that: - - "result.failed == true" - - "'Accessing files from outside the working dir' in result.msg" - msg: Patch must fail due to accessing files outside the working dir diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test-localhost/files/patch b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test-localhost/files/patch deleted file mode 100644 index aa2c60eb0..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test-localhost/files/patch +++ /dev/null @@ -1,7 +0,0 @@ -diff --git a/readme.txt b/readme.txt -index 24308cb..b07f0ed 100644 ---- a/readme.txt -+++ b/readme.txt -@@ -1 +1 @@ --This is a readme -+This is a README diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test-localhost/files/readme.txt b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test-localhost/files/readme.txt deleted file mode 100644 index 24308cb38..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test-localhost/files/readme.txt +++ /dev/null @@ -1 +0,0 @@ -This is a readme diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test-localhost/tasks/main.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test-localhost/tasks/main.yaml deleted file mode 100644 index 30c4c23e6..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test-localhost/tasks/main.yaml +++ /dev/null @@ -1,27 +0,0 @@ -- name: Patch with basedir - patch: - src: patch - basedir: "/opt/patch-dest" - strip: 1 - register: result - ignore_errors: true - -- assert: - that: - - "result.failed == true" - - "'Accessing files from outside the working dir' in result.msg" - msg: Patch must fail due to accessing files outside the working dir - -- name: Patch with dest - patch: - src: patch - dest: "/opt/patch-dest/readme" - strip: 1 - register: result - ignore_errors: true - -- assert: - that: - - "result.failed == true" - - "'Accessing files from outside the working dir' in result.msg" - msg: Patch must fail due to accessing files outside the working dir diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test/files/patch b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test/files/patch deleted file mode 100644 index aa2c60eb0..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test/files/patch +++ /dev/null @@ -1,7 +0,0 @@ -diff --git a/readme.txt b/readme.txt -index 24308cb..b07f0ed 100644 ---- a/readme.txt -+++ b/readme.txt -@@ -1 +1 @@ --This is a readme -+This is a README diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test/files/readme.txt b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test/files/readme.txt deleted file mode 100644 index 24308cb38..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test/files/readme.txt +++ /dev/null @@ -1 +0,0 @@ -This is a readme diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test/files/symlink b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test/files/symlink deleted file mode 100644 index 159669522..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test/files/symlink +++ /dev/null @@ -1 +0,0 @@ -symlink: /opt/patch diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test/tasks/main.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test/tasks/main.yaml deleted file mode 100644 index c1c4ccba8..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test/tasks/main.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- name: Create a destination directory for copied files - tempfile: - state: directory - register: destdir - -- name: Copy readme - copy: - src: readme.txt - dest: "{{destdir.path}}/readme.txt" - -- name: Patch - patch: - src: "{{src_file}}" - basedir: "{{destdir.path}}" - strip: 1 diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/raw-test-delegate/tasks/main.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/raw-test-delegate/tasks/main.yaml deleted file mode 100644 index ccdf9a422..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/raw-test-delegate/tasks/main.yaml +++ /dev/null @@ -1,5 +0,0 @@ -- include: script-delegate.yaml - with_items: - - ::1 - - 127.0.0.1 - - localhost diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/raw-test-delegate/tasks/script-delegate.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/raw-test-delegate/tasks/script-delegate.yaml deleted file mode 100644 index 339c1b724..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/raw-test-delegate/tasks/script-delegate.yaml +++ /dev/null @@ -1,11 +0,0 @@ -- name: Raw - raw: echo 123 - delegate_to: "{{ item }}" - register: result - ignore_errors: true - -- assert: - that: - - "result.failed == true" - - "'Executing local code is prohibited' in result.msg" - msg: Raw must fail due to local code execution restriction diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/raw-test-localhost/tasks/main.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/raw-test-localhost/tasks/main.yaml deleted file mode 100644 index 5b0f8c68d..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/raw-test-localhost/tasks/main.yaml +++ /dev/null @@ -1,10 +0,0 @@ -- name: Raw - raw: echo 123 - register: result - ignore_errors: true - -- assert: - that: - - "result.failed == true" - - "'Executing local code is prohibited' in result.msg" - msg: Script must fail due to local code execution restriction diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test-delegate/files/script.sh b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test-delegate/files/script.sh deleted file mode 100644 index 6baacbc54..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test-delegate/files/script.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -echo one diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test-delegate/tasks/main.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test-delegate/tasks/main.yaml deleted file mode 100644 index ccdf9a422..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test-delegate/tasks/main.yaml +++ /dev/null @@ -1,5 +0,0 @@ -- include: script-delegate.yaml - with_items: - - ::1 - - 127.0.0.1 - - localhost diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test-delegate/tasks/script-delegate.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test-delegate/tasks/script-delegate.yaml deleted file mode 100644 index c67d104a1..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test-delegate/tasks/script-delegate.yaml +++ /dev/null @@ -1,11 +0,0 @@ -- name: Script - script: script.sh - delegate_to: "{{ item }}" - register: result - ignore_errors: true - -- assert: - that: - - "result.failed == true" - - "'Executing local code is prohibited' in result.msg" - msg: Script must fail due to local code execution restriction diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test-localhost/files/script.sh b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test-localhost/files/script.sh deleted file mode 100644 index 6baacbc54..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test-localhost/files/script.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -echo one diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test-localhost/tasks/main.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test-localhost/tasks/main.yaml deleted file mode 100644 index 301980f9f..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test-localhost/tasks/main.yaml +++ /dev/null @@ -1,10 +0,0 @@ -- name: Script - script: script.sh - register: result - ignore_errors: true - -- assert: - that: - - "result.failed == true" - - "'Executing local code is prohibited' in result.msg" - msg: Script must fail due to local code execution restriction diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test/files/archive.tar b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test/files/archive.tar Binary files differdeleted file mode 100644 index f5fad529a..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test/files/archive.tar +++ /dev/null diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test/files/one b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test/files/one deleted file mode 100644 index 5626abf0f..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test/files/one +++ /dev/null @@ -1 +0,0 @@ -one diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test/files/script.sh b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test/files/script.sh deleted file mode 100644 index 6baacbc54..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test/files/script.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -echo one diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test/files/symlink b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test/files/symlink deleted file mode 100644 index 8bc5f4406..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test/files/symlink +++ /dev/null @@ -1 +0,0 @@ -symlink: /opt/script.sh diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test/tasks/main.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test/tasks/main.yaml deleted file mode 100644 index 74fe56152..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test/tasks/main.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- name: Script - script: "{{src_file}}" diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/template-test-delegate/tasks/main.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/template-test-delegate/tasks/main.yaml deleted file mode 100644 index 5ac1f7790..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/template-test-delegate/tasks/main.yaml +++ /dev/null @@ -1,21 +0,0 @@ -- include: template-delegate.yaml - with_items: - - ::1 - - 127.0.0.1 - - localhost - -- name: Define target dir - set_fact: - targetdir: "{{ zuul.executor.work_root }}/template-target" - -- name: Create target dir - file: - state: directory - path: "{{ targetdir }}" - delegate_to: localhost - -- name: Template into safe path - template: - src: template - dest: "{{ targetdir }}/dest-file" - delegate_to: localhost diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/template-test-delegate/tasks/template-delegate.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/template-test-delegate/tasks/template-delegate.yaml deleted file mode 100644 index 506dced39..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/template-test-delegate/tasks/template-delegate.yaml +++ /dev/null @@ -1,13 +0,0 @@ -- name: Template - copy: - src: template - dest: /opt/copy-dest - delegate_to: "{{ item }}" - register: result - ignore_errors: true - -- assert: - that: - - "result.failed == true" - - "'Accessing files from outside the working dir' in result.msg" - msg: Template must fail due to accessing files outside the working dir diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/template-test-delegate/templates/template b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/template-test-delegate/templates/template deleted file mode 100644 index e69de29bb..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/template-test-delegate/templates/template +++ /dev/null diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/template-test-localhost/tasks/main.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/template-test-localhost/tasks/main.yaml deleted file mode 100644 index 678e2b636..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/template-test-localhost/tasks/main.yaml +++ /dev/null @@ -1,12 +0,0 @@ -- name: Template - copy: - src: template - dest: /opt/copy-dest - register: result - ignore_errors: true - -- assert: - that: - - "result.failed == true" - - "'Accessing files from outside the working dir' in result.msg" - msg: Template must fail due to accessing files outside the working dir diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/template-test-localhost/templates/template b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/template-test-localhost/templates/template deleted file mode 100644 index e69de29bb..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/template-test-localhost/templates/template +++ /dev/null diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/template-test/tasks/main.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/template-test/tasks/main.yaml deleted file mode 100644 index d4c794b59..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/template-test/tasks/main.yaml +++ /dev/null @@ -1,9 +0,0 @@ -- name: Create a destination directory for copied files - tempfile: - state: directory - register: destdir - -- name: Copy - template: - src: "{{src_file}}" - dest: "{{destdir.path}}/template" diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/template-test/templates/symlink b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/template-test/templates/symlink deleted file mode 100644 index 33e34a832..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/template-test/templates/symlink +++ /dev/null @@ -1 +0,0 @@ -symlink: /opt/file diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/template-test/templates/template b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/template-test/templates/template deleted file mode 100644 index e69de29bb..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/template-test/templates/template +++ /dev/null diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/unarchive-test-delegate/files/archive.tar b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/unarchive-test-delegate/files/archive.tar Binary files differdeleted file mode 100644 index 0c6f83acd..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/unarchive-test-delegate/files/archive.tar +++ /dev/null diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/unarchive-test-delegate/tasks/main.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/unarchive-test-delegate/tasks/main.yaml deleted file mode 100644 index 715484643..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/unarchive-test-delegate/tasks/main.yaml +++ /dev/null @@ -1,21 +0,0 @@ -- include: unarchive-delegate.yaml - with_items: - - ::1 - - 127.0.0.1 - - localhost - -- name: Define target dir - set_fact: - targetdir: "{{ zuul.executor.work_root }}/unarchive-target" - -- name: Create target dir - file: - state: directory - path: "{{ targetdir }}" - delegate_to: localhost - -- name: Unarchive - copy: - src: archive.tar - dest: "{{ targetdir }}" - delegate_to: localhost diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/unarchive-test-delegate/tasks/unarchive-delegate.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/unarchive-test-delegate/tasks/unarchive-delegate.yaml deleted file mode 100644 index ca5070772..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/unarchive-test-delegate/tasks/unarchive-delegate.yaml +++ /dev/null @@ -1,13 +0,0 @@ -- name: Unarchive - copy: - src: archive.tar - dest: /opt/unarchive-dest - delegate_to: "{{ item }}" - register: result - ignore_errors: true - -- assert: - that: - - "result.failed == true" - - "'Accessing files from outside the working dir' in result.msg" - msg: Unarchive must fail due to accessing files outside the working dir diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/unarchive-test-localhost/files/archive.tar b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/unarchive-test-localhost/files/archive.tar Binary files differdeleted file mode 100644 index 0c6f83acd..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/unarchive-test-localhost/files/archive.tar +++ /dev/null diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/unarchive-test-localhost/tasks/main.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/unarchive-test-localhost/tasks/main.yaml deleted file mode 100644 index 1a04ee194..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/unarchive-test-localhost/tasks/main.yaml +++ /dev/null @@ -1,12 +0,0 @@ -- name: Unarchive - copy: - src: archive.tar - dest: /opt/unarchive-dest - register: result - ignore_errors: true - -- assert: - that: - - "result.failed == true" - - "'Accessing files from outside the working dir' in result.msg" - msg: Unarchive must fail due to accessing files outside the working dir diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/unarchive-test/files/archive.tar b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/unarchive-test/files/archive.tar Binary files differdeleted file mode 100644 index 0c6f83acd..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/unarchive-test/files/archive.tar +++ /dev/null diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/unarchive-test/files/symlink b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/unarchive-test/files/symlink deleted file mode 100644 index 1b179b22c..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/unarchive-test/files/symlink +++ /dev/null @@ -1 +0,0 @@ -symlink: /opt/archive.tar diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/unarchive-test/tasks/main.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/unarchive-test/tasks/main.yaml deleted file mode 100644 index 3ecfdd524..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/unarchive-test/tasks/main.yaml +++ /dev/null @@ -1,9 +0,0 @@ -- name: Create a destination directory for copied files - tempfile: - state: directory - register: destdir - -- name: Unarchive - copy: - src: "{{src_file}}" - dest: "{{destdir.path}}" diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/script-bad-symlink.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/script-bad-symlink.yaml deleted file mode 100644 index 92c15bffb..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/script-bad-symlink.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - roles: - - role: script-test - src_file: symlink diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/script-bad.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/script-bad.yaml deleted file mode 100644 index e124c7ccc..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/script-bad.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - roles: - - role: script-test - src_file: /opt/script.sh diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/script-delegate.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/script-delegate.yaml deleted file mode 100644 index a8353c713..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/script-delegate.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- hosts: all - roles: - - script-test-delegate diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/script-good.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/script-good.yaml deleted file mode 100644 index 5d8e3901c..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/script-good.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - roles: - - role: script-test - src_file: script.sh diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/script-localhost.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/script-localhost.yaml deleted file mode 100644 index 8f72399a4..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/script-localhost.yaml +++ /dev/null @@ -1,11 +0,0 @@ -- hosts: localhost - roles: - - script-test-localhost - -- hosts: 127.0.0.1 - roles: - - script-test-localhost - -- hosts: "::1" - roles: - - script-test-localhost diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/shell-delegate.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/shell-delegate.yaml deleted file mode 100644 index 7cb81e3b7..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/shell-delegate.yaml +++ /dev/null @@ -1,12 +0,0 @@ -- hosts: all - tasks: - - name: Normal shell - delegate_to: localhost - shell: echo 123 - - - name: Shell with executable - delegate_to: localhost - shell: | - echo 123 - args: - executable: /bin/bash diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/shell-localhost.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/shell-localhost.yaml deleted file mode 100644 index 35f7253f1..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/shell-localhost.yaml +++ /dev/null @@ -1,10 +0,0 @@ -- hosts: localhost - tasks: - - name: Normal shell - shell: echo 123 - - - name: Shell with executable - shell: | - echo 123 - args: - executable: /bin/bash diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/synchronize-bad-pull.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/synchronize-bad-pull.yaml deleted file mode 100644 index 603a4da9d..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/synchronize-bad-pull.yaml +++ /dev/null @@ -1,12 +0,0 @@ -- hosts: all - tasks: - - name: Execute common-copy role - include_role: - name: common-copy - - - name: Test pull mode - synchronize: - dest: "/tmp" - mode: pull - src: "{{ destdir.path }}/" - verify_host: true diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/synchronize-bad-push.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/synchronize-bad-push.yaml deleted file mode 100644 index f9d9080a8..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/synchronize-bad-push.yaml +++ /dev/null @@ -1,12 +0,0 @@ -- hosts: all - tasks: - - name: Execute common-copy role - include_role: - name: common-copy - - - name: Test push mode - synchronize: - dest: "{{ destdir.path }}/" - mode: push - src: "/tmp" - verify_host: true diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/synchronize-delegate-good.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/synchronize-delegate-good.yaml deleted file mode 100644 index 595ef2a72..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/synchronize-delegate-good.yaml +++ /dev/null @@ -1,59 +0,0 @@ -- hosts: all - tasks: - - name: Execute common-copy role - include_role: - name: common-copy - - - name: create temporary build directory - tempfile: - path: /tmp - state: directory - register: _tmpdir - - - name: Ensure controller pull directory - file: - path: "{{ _tmpdir.path }}/pull" - state: directory - - - name: Test pull mode - synchronize: - dest: "{{ _tmpdir.path }}/pull/" - mode: pull - src: "{{ destdir.path }}/" - verify_host: true - delegate_to: "{{ inventory_hostname }}" - - - name: Validate pull - stat: - path: "{{ _tmpdir.path }}/pull/common-file" - register: _pull - - - name: Assert pull - assert: - that: - - _pull.stat.exists - - _pull.stat.isreg - - - name: Ensure controller push directory - file: - path: "{{ _tmpdir.path }}/push" - state: directory - - - name: Test push mode - synchronize: - dest: "{{ _tmpdir.path }}/push/" - mode: push - src: "{{ destdir.path }}/" - verify_host: true - delegate_to: "{{ inventory_hostname }}" - - - name: Validate push - stat: - path: "{{ _tmpdir.path }}/push/common-file" - register: _push - - - name: Assert push - assert: - that: - - _push.stat.exists - - _push.stat.isreg diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/synchronize-good.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/synchronize-good.yaml deleted file mode 100644 index 05bb3e616..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/synchronize-good.yaml +++ /dev/null @@ -1,57 +0,0 @@ -- hosts: all - tasks: - - name: Execute common-copy role - include_role: - name: common-copy - - - name: Ensure executor push directory - file: - path: "{{ zuul.executor.log_root }}/push" - state: directory - delegate_to: localhost - - - name: Test pull mode - synchronize: - dest: "{{ zuul.executor.log_root }}/push" - mode: pull - src: "{{ destdir.path }}/" - verify_host: true - environment: - OK: "we can use custom env" - - - name: Validate push - stat: - path: "{{ zuul.executor.log_root }}/push/common-file" - register: _push - delegate_to: localhost - - - name: Assert push - assert: - that: - - _push.stat.exists - - _push.stat.isreg - - - name: Ensure controller pull directory - file: - path: "{{ destdir.path }}/pull" - state: directory - - - name: Test push mode - synchronize: - dest: "{{ destdir.path }}/pull/" - mode: push - src: "{{ zuul.executor.log_root }}/push" - rsync_opts: - - "--safe-links" - verify_host: true - - - name: Validate pull - stat: - path: "{{ destdir.path }}/pull/push/common-file" - register: _pull - - - name: Assert pull - assert: - that: - - _pull.stat.exists - - _pull.stat.isreg diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/synchronize-rsh-bad.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/synchronize-rsh-bad.yaml deleted file mode 100644 index e14c6e3fb..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/synchronize-rsh-bad.yaml +++ /dev/null @@ -1,8 +0,0 @@ -- hosts: all - tasks: - - synchronize: - rsync_opts: - - "--rsh={{ zuul.executor.log_root }}/oops" - src: "/proc/cmdline" - dest: "{{ zuul.executor.log_root }}/noop" - mode: pull diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/synchronize-rsh-env-bad.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/synchronize-rsh-env-bad.yaml deleted file mode 100644 index d051e002b..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/synchronize-rsh-env-bad.yaml +++ /dev/null @@ -1,8 +0,0 @@ -- hosts: all - tasks: - - synchronize: - src: "/proc/cmdline" - dest: "{{ zuul.executor.log_root }}/noop" - mode: pull - environment: - RSYNC_RSH: "{{ zuul.executor.log_root }}/oops" diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/template-bad-symlink.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/template-bad-symlink.yaml deleted file mode 100644 index b353b8c80..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/template-bad-symlink.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - roles: - - role: template-test - src_file: symlink diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/template-bad.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/template-bad.yaml deleted file mode 100644 index 3a1738ec4..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/template-bad.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - roles: - - role: template-test - src_file: /opt/file diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/template-delegate.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/template-delegate.yaml deleted file mode 100644 index f13b05c76..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/template-delegate.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- hosts: all - roles: - - template-test-delegate diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/template-good.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/template-good.yaml deleted file mode 100644 index 1417a71c8..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/template-good.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - roles: - - role: template-test - src_file: template diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/template-localhost.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/template-localhost.yaml deleted file mode 100644 index 72622ea39..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/template-localhost.yaml +++ /dev/null @@ -1,11 +0,0 @@ -- hosts: localhost - roles: - - template-test-localhost - -- hosts: 127.0.0.1 - roles: - - template-test-localhost - -- hosts: "::1" - roles: - - template-test-localhost diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/unarchive-bad-symlink.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/unarchive-bad-symlink.yaml deleted file mode 100644 index 2f910747d..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/unarchive-bad-symlink.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - roles: - - role: unarchive-test - src_file: symlink diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/unarchive-bad.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/unarchive-bad.yaml deleted file mode 100644 index ecd8dadca..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/unarchive-bad.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - roles: - - role: unarchive-test - src_file: /opt/archive.tar diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/unarchive-delegate.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/unarchive-delegate.yaml deleted file mode 100644 index 5cbb07348..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/unarchive-delegate.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- hosts: all - roles: - - unarchive-test-delegate diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/unarchive-good.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/unarchive-good.yaml deleted file mode 100644 index 6fab4341e..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/unarchive-good.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - roles: - - role: unarchive-test - src_file: archive.tar diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/unarchive-localhost.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/unarchive-localhost.yaml deleted file mode 100644 index 6406aaa11..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/unarchive-localhost.yaml +++ /dev/null @@ -1,11 +0,0 @@ -- hosts: localhost - roles: - - unarchive-test-localhost - -- hosts: 127.0.0.1 - roles: - - unarchive-test-localhost - -- hosts: "::1" - roles: - - unarchive-test-localhost diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/uri-bad-dest.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/uri-bad-dest.yaml deleted file mode 100644 index 6c151842a..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/uri-bad-dest.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- hosts: localhost - tasks: - - name: Request with bad src - uri: - url: https://zuul.opendev.org - dest: /etc/zuul-uri-output-testing diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/uri-bad-src.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/uri-bad-src.yaml deleted file mode 100644 index 9a9460c9b..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/uri-bad-src.yaml +++ /dev/null @@ -1,7 +0,0 @@ -- hosts: localhost - tasks: - - name: Request with bad src - uri: - url: https://zuul.opendev.org - method: POST - src: /etc/resolv.conf diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/uri-bad-url.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/uri-bad-url.yaml deleted file mode 100644 index 222f1925a..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/uri-bad-url.yaml +++ /dev/null @@ -1,14 +0,0 @@ -- hosts: localhost - tasks: - - name: Request with bad url scheme - uri: - url: "file:///etc/resolv.conf" - dest: "{{ zuul.executor.log_root }}/resolv.conf" - - name: stat file that shouldnt exist - stat: - path: "{{ zuul.executor.log_root }}/resolv.conf" - register: test_stat - - name: Debug the stat - debug: - msg: "resolv.conf exists when it shouldn't" - when: test_stat.stat.exists diff --git a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/uri-good.yaml b/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/uri-good.yaml deleted file mode 100644 index 0416cef4e..000000000 --- a/tests/fixtures/config/remote-action-modules/git/org_project/playbooks/uri-good.yaml +++ /dev/null @@ -1,16 +0,0 @@ -- hosts: localhost - tasks: - - name: Safe uri request from localhost - uri: - # We don't seem to have working ssl cert chains in - # the test bwrap context. Use http to workaround that - # and don't follow the redirect to https. - url: http://zuul.opendev.org - follow_redirects: none - return_content: yes - status_code: - - 301 - - 302 - - 303 - - 307 - - 308 diff --git a/tests/remote/test_remote_action_modules.py b/tests/remote/test_remote_action_modules.py index a147a9e5d..d8dee6ee3 100644 --- a/tests/remote/test_remote_action_modules.py +++ b/tests/remote/test_remote_action_modules.py @@ -15,14 +15,7 @@ import os import textwrap -from tests.base import AnsibleZuulTestCase, FIXTURE_DIR - -ERROR_ACCESS_OUTSIDE = "Accessing files from outside the working dir" -ERROR_LOCAL_CODE = "Executing local code is prohibited" -ERROR_SYNC_TO_OUTSIDE = "Syncing files to outside the working dir" -ERROR_SYNC_FROM_OUTSIDE = "Syncing files from outside the working dir" -ERROR_SYNC_RSH = "Using custom synchronize rsh is prohibited" -ERROR_SCHEME_INVALID = "file urls are not allowed from localhost." +from tests.base import AnsibleZuulTestCase class FunctionalActionModulesMixIn: @@ -37,11 +30,6 @@ class FunctionalActionModulesMixIn: ansible_remote = os.environ.get('ZUUL_REMOTE_IPV4') self.assertIsNotNone(ansible_remote) - # inject some files as forbidden sources - fixture_dir = os.path.join(FIXTURE_DIR, 'bwrap-mounts') - self.executor_server.execution_wrapper.bwrap_command.extend( - ['--ro-bind', fixture_dir, '/opt']) - def _run_job(self, job_name, result, expect_error=None): # Keep the jobdir around so we can inspect contents if an # assert fails. It will be cleaned up anyway as it is contained @@ -86,24 +74,6 @@ class FunctionalActionModulesMixIn: with open(path, 'r') as f: self.assertIn(expect_error, f.read()) - def test_assemble_module(self): - self._run_job('assemble-good', 'SUCCESS') - - # assemble-delegate does multiple tests with various delegates and - # safe and non-safe paths. It asserts by itself within ansible so we - # expect SUCCESS here. - self._run_job('assemble-delegate', 'SUCCESS') - self._run_job('assemble-localhost', 'SUCCESS') - - self._run_job('assemble-bad', 'FAILURE', ERROR_ACCESS_OUTSIDE) - self._run_job('assemble-bad-symlink', 'FAILURE', ERROR_ACCESS_OUTSIDE) - self._run_job('assemble-bad-dir-with-symlink', 'FAILURE', - ERROR_ACCESS_OUTSIDE) - - def test_synchronize_rsh_fail(self): - self._run_job('synchronize-rsh-bad', 'FAILURE', ERROR_SYNC_RSH) - self._run_job('synchronize-rsh-env-bad', 'FAILURE', ERROR_SYNC_RSH) - def test_command_module(self): self._run_job('command-good', 'SUCCESS') @@ -113,120 +83,8 @@ class FunctionalActionModulesMixIn: def test_zuul_return_module_delegate_to(self): self._run_job('zuul_return-good-delegate', 'SUCCESS') - def test_copy_module(self): - self._run_job('copy-good', 'SUCCESS') - - # copy-delegate does multiple tests with various delegates and - # safe and non-safe paths. It asserts by itself within ansible so we - # expect SUCCESS here. - self._run_job('copy-delegate', 'SUCCESS') - self._run_job('copy-localhost', 'SUCCESS') - - self._run_job('copy-bad', 'FAILURE', ERROR_ACCESS_OUTSIDE) - self._run_job('copy-bad-symlink', 'FAILURE', ERROR_ACCESS_OUTSIDE) - self._run_job('copy-bad-dir-with-symlink', 'FAILURE', - ERROR_ACCESS_OUTSIDE) - - def test_includevars_module(self): - self._run_job('includevars-good', 'SUCCESS') - self._run_job('includevars-good-dir', 'SUCCESS') - - self._run_job('includevars-bad', 'FAILURE', ERROR_ACCESS_OUTSIDE) - self._run_job('includevars-bad-symlink', 'FAILURE', - ERROR_ACCESS_OUTSIDE) - self._run_job('includevars-bad-dir', 'FAILURE', ERROR_ACCESS_OUTSIDE) - self._run_job('includevars-bad-dir-symlink', 'FAILURE', - ERROR_ACCESS_OUTSIDE) - self._run_job('includevars-bad-dir-with-symlink', 'FAILURE', - ERROR_ACCESS_OUTSIDE) - self._run_job('includevars-bad-dir-with-double-symlink', 'FAILURE', - ERROR_ACCESS_OUTSIDE) - - def test_patch_module(self): - self._run_job('patch-good', 'SUCCESS') - - # patch-delegate does multiple tests with various delegates and - # safe and non-safe paths. It asserts by itself within ansible so we - # expect SUCCESS here. - self._run_job('patch-delegate', 'SUCCESS') - self._run_job('patch-localhost', 'SUCCESS') - - self._run_job('patch-bad', 'FAILURE', ERROR_ACCESS_OUTSIDE) - self._run_job('patch-bad-symlink', 'FAILURE', ERROR_ACCESS_OUTSIDE) - - def test_raw_module(self): - self._run_job('raw-good', 'SUCCESS') - - # raw-delegate does multiple tests with various delegates. It - # asserts by itself within ansible so we - # expect SUCCESS here. - self._run_job('raw-delegate', 'SUCCESS') - self._run_job('raw-localhost', 'SUCCESS') - - def test_script_module(self): - self._run_job('script-good', 'SUCCESS') - - # script-delegate does multiple tests with various delegates. It - # asserts by itself within ansible so we - # expect SUCCESS here. - self._run_job('script-delegate', 'SUCCESS') - self._run_job('script-localhost', 'SUCCESS') - - self._run_job('script-bad', 'FAILURE', ERROR_ACCESS_OUTSIDE) - self._run_job('script-bad-symlink', 'FAILURE', ERROR_ACCESS_OUTSIDE) - def test_shell_module(self): self._run_job('shell-good', 'SUCCESS') - self._run_job('shell-localhost', 'FAILURE', ERROR_LOCAL_CODE) - self._run_job('shell-delegate', 'FAILURE', ERROR_LOCAL_CODE) - - def test_synchronize_module(self): - self._run_job('synchronize-good', 'SUCCESS') - self._run_job('synchronize-bad-pull', 'FAILURE', ERROR_SYNC_TO_OUTSIDE) - self._run_job( - 'synchronize-bad-push', 'FAILURE', ERROR_SYNC_FROM_OUTSIDE) - self._run_job('synchronize-delegate-good', 'SUCCESS') - - def test_template_module(self): - self._run_job('template-good', 'SUCCESS') - - # template-delegate does multiple tests with various delegates and - # safe and non-safe paths. It asserts by itself within ansible so we - # expect SUCCESS here. - self._run_job('template-delegate', 'SUCCESS') - self._run_job('template-localhost', 'SUCCESS') - - self._run_job('template-bad', 'FAILURE', ERROR_ACCESS_OUTSIDE) - self._run_job('template-bad-symlink', 'FAILURE', ERROR_ACCESS_OUTSIDE) - - def test_unarchive_module(self): - self._run_job('unarchive-good', 'SUCCESS') - - # template-delegate does multiple tests with various delegates and - # safe and non-safe paths. It asserts by itself within ansible so we - # expect SUCCESS here. - self._run_job('unarchive-delegate', 'SUCCESS') - self._run_job('unarchive-localhost', 'SUCCESS') - - self._run_job('unarchive-bad', 'FAILURE', ERROR_ACCESS_OUTSIDE) - self._run_job('unarchive-bad-symlink', 'FAILURE', ERROR_ACCESS_OUTSIDE) - - def test_known_hosts_module(self): - self._run_job('known-hosts-good', 'SUCCESS') - - # known-hosts-delegate does multiple tests with various delegates and - # safe and non-safe paths. It asserts by itself within ansible so we - # expect SUCCESS here. - self._run_job('known-hosts-delegate', 'SUCCESS') - self._run_job('known-hosts-localhost', 'SUCCESS') - - self._run_job('known-hosts-bad', 'FAILURE', ERROR_ACCESS_OUTSIDE) - - def test_uri_module(self): - self._run_job('uri-good', 'SUCCESS') - self._run_job('uri-bad-src', 'FAILURE', ERROR_ACCESS_OUTSIDE) - self._run_job('uri-bad-dest', 'FAILURE', ERROR_ACCESS_OUTSIDE) - self._run_job('uri-bad-url', 'FAILURE', ERROR_SCHEME_INVALID) class TestActionModules28(AnsibleZuulTestCase, FunctionalActionModulesMixIn): |