From 54cfe138c97a1d33bbb6c67c719e0cb536bdabaf Mon Sep 17 00:00:00 2001 From: Alex Willmer Date: Tue, 21 May 2024 15:25:22 +0100 Subject: [PATCH] WIP --- tests/ansible/all.yml | 4 +- tests/ansible/integration/all.yml | 69 ++++++++++--------- .../integration/context_service/all.yml | 8 +-- .../context_service/remote_tmp.yml | 15 +++- tox.ini | 2 + 5 files changed, 55 insertions(+), 43 deletions(-) diff --git a/tests/ansible/all.yml b/tests/ansible/all.yml index 7a3e7000..e3034fa3 100644 --- a/tests/ansible/all.yml +++ b/tests/ansible/all.yml @@ -1,6 +1,6 @@ - import_playbook: setup/all.yml tags: setup -- import_playbook: regression/all.yml - tags: regression +#- import_playbook: regression/all.yml +# tags: regression - import_playbook: integration/all.yml tags: integration diff --git a/tests/ansible/integration/all.yml b/tests/ansible/integration/all.yml index ac196584..e393edac 100644 --- a/tests/ansible/integration/all.yml +++ b/tests/ansible/integration/all.yml @@ -3,39 +3,40 @@ # This playbook imports all tests that are known to work at present. # -- import_playbook: action/all.yml - tags: action -- import_playbook: async/all.yml - tags: async -- import_playbook: become/all.yml - tags: become -- import_playbook: connection/all.yml - tags: connection -- import_playbook: connection_delegation/all.yml - tags: connection_delegation -- import_playbook: connection_loader/all.yml - tags: connection_loader +#- import_playbook: action/all.yml +# tags: action +#- import_playbook: async/all.yml +# tags: async +#- import_playbook: become/all.yml +# tags: become +#- import_playbook: connection/all.yml +# tags: connection +#- import_playbook: connection_delegation/all.yml +# tags: connection_delegation +#- import_playbook: connection_loader/all.yml +# tags: connection_loader - import_playbook: context_service/all.yml tags: context_service -- import_playbook: glibc_caches/all.yml - tags: glibc_caches -- import_playbook: interpreter_discovery/all.yml - tags: interpreter_discovery -- import_playbook: local/all.yml - tags: local -- import_playbook: module_utils/all.yml - tags: module_utils -- import_playbook: playbook_semantics/all.yml - tags: playbook_semantics -- import_playbook: process/all.yml - tags: process -- import_playbook: runner/all.yml - tags: runner -- import_playbook: ssh/all.yml - tags: ssh -- import_playbook: strategy/all.yml - tags: strategy -- import_playbook: stub_connections/all.yml - tags: stub_connections -- import_playbook: transport_config/all.yml - tags: transport_config +#- import_playbook: glibc_caches/all.yml +# tags: glibc_caches +#- import_playbook: interpreter_discovery/all.yml +# tags: interpreter_discovery +#- import_playbook: local/all.yml +# tags: local +#- import_playbook: module_utils/all.yml +# tags: module_utils +#- import_playbook: playbook_semantics/all.yml +# tags: playbook_semantics +#- import_playbook: process/all.yml +# tags: process +#- import_playbook: runner/all.yml +# tags: runner +#- import_playbook: ssh/all.yml +# tags: ssh +#- import_playbook: strategy/all.yml +# tags: strategy +#- import_playbook: stub_connections/all.yml +# tags: stub_connections +#- import_playbook: transport_config/all.yml +# tags: transport_config +# \ No newline at end of file diff --git a/tests/ansible/integration/context_service/all.yml b/tests/ansible/integration/context_service/all.yml index 58057da7..ee2b124a 100644 --- a/tests/ansible/integration/context_service/all.yml +++ b/tests/ansible/integration/context_service/all.yml @@ -1,5 +1,5 @@ -- import_playbook: disconnect_cleanup.yml -- import_playbook: lru_one_target.yml -- import_playbook: reconnection.yml -- import_playbook: remote_name.yml +#- import_playbook: disconnect_cleanup.yml +#- import_playbook: lru_one_target.yml +#- import_playbook: reconnection.yml +#- import_playbook: remote_name.yml - import_playbook: remote_tmp.yml diff --git a/tests/ansible/integration/context_service/remote_tmp.yml b/tests/ansible/integration/context_service/remote_tmp.yml index efa92467..efe47e86 100644 --- a/tests/ansible/integration/context_service/remote_tmp.yml +++ b/tests/ansible/integration/context_service/remote_tmp.yml @@ -3,8 +3,6 @@ - name: integration/context_service/remote_tmp.yml hosts: test-targets gather_facts: false - vars: - ansible_remote_tmp: ~/.ansible/remote_tmp_test tasks: - name: Exercise ansible_remote_tmp copy: @@ -13,9 +11,20 @@ content: | Created by integration/context_service/remote_tmp.yml + - debug: + msg: ANSIBLE_REMOTE_TMP={{ lookup('env', 'ANSIBLE_REMOTE_TMP') }} + + - command: + ls -l "{{ lookup('env', 'ANSIBLE_REMOTE_TMP') }}" + changed_when: false + register: out + + - debug: + var: out + - name: Delete ansible_remote_tmp raw: | - rm -rf "{{ ansible_remote_tmp }}" + rm -rf "{{ lookup('env', 'ANSIBLE_REMOTE_TMP') }}" - name: Do something else that requires ansible_remote_tmp file: diff --git a/tox.ini b/tox.ini index 55fd1842..57959665 100644 --- a/tox.ini +++ b/tox.ini @@ -105,8 +105,10 @@ passenv = AWS_SECRET_ACCESS_KEY HOME setenv = + ANSIBLE_REMOTE_TMP = ~/.local/remote_tmp_test # See also azure-pipelines.yml ANSIBLE_STRATEGY = mitogen_linear + ANSIBLE_VERBOSITY = 3 NOCOVERAGE_ERASE = 1 NOCOVERAGE_REPORT = 1 # Only applicable to MODE=mitogen