From 263c5ba9de43abbe7671d72a7dcf151a4f6d9de5 Mon Sep 17 00:00:00 2001 From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com> Date: Tue, 21 Sep 2021 09:03:28 +0200 Subject: [PATCH] Make ready for split-controller testing in ansible-core (#3345) (#3412) * Accept context/ in aliases. * Mark ansible_galaxy_install test as context/controller. * Fix interfaces_file test. ci_complete * Install pyone dependency. ci_complete (cherry picked from commit 98d071f61ed5756c8f53829018ef0c57e1f39129) Co-authored-by: Felix Fontein --- tests/integration/targets/ansible_galaxy_install/aliases | 1 + tests/integration/targets/interfaces_file/meta/main.yml | 2 ++ tests/integration/targets/interfaces_file/tasks/main.yml | 2 +- tests/integration/targets/one_template/meta/main.yml | 2 ++ tests/integration/targets/setup_opennebula/meta/main.yml | 2 ++ tests/integration/targets/setup_opennebula/tasks/main.yml | 5 +++++ tests/sanity/extra/aliases.py | 2 ++ 7 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 tests/integration/targets/interfaces_file/meta/main.yml create mode 100644 tests/integration/targets/one_template/meta/main.yml create mode 100644 tests/integration/targets/setup_opennebula/meta/main.yml create mode 100644 tests/integration/targets/setup_opennebula/tasks/main.yml diff --git a/tests/integration/targets/ansible_galaxy_install/aliases b/tests/integration/targets/ansible_galaxy_install/aliases index ca7873ddab..e9dc8635ac 100644 --- a/tests/integration/targets/ansible_galaxy_install/aliases +++ b/tests/integration/targets/ansible_galaxy_install/aliases @@ -1,3 +1,4 @@ destructive shippable/posix/group3 skip/python2.6 +context/controller # While this is not really true, this module mainly is run on the controller, *and* needs access to the ansible-galaxy CLI tool diff --git a/tests/integration/targets/interfaces_file/meta/main.yml b/tests/integration/targets/interfaces_file/meta/main.yml new file mode 100644 index 0000000000..1810d4bec9 --- /dev/null +++ b/tests/integration/targets/interfaces_file/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: + - setup_remote_tmp_dir diff --git a/tests/integration/targets/interfaces_file/tasks/main.yml b/tests/integration/targets/interfaces_file/tasks/main.yml index af33eb8892..2a39076e53 100644 --- a/tests/integration/targets/interfaces_file/tasks/main.yml +++ b/tests/integration/targets/interfaces_file/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: set_fact: - interfaces_testfile: '{{ output_dir }}/interfaces' + interfaces_testfile: '{{ remote_tmp_dir }}/interfaces' - name: Copy interfaces file copy: diff --git a/tests/integration/targets/one_template/meta/main.yml b/tests/integration/targets/one_template/meta/main.yml new file mode 100644 index 0000000000..86752df8dd --- /dev/null +++ b/tests/integration/targets/one_template/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: + - setup_opennebula \ No newline at end of file diff --git a/tests/integration/targets/setup_opennebula/meta/main.yml b/tests/integration/targets/setup_opennebula/meta/main.yml new file mode 100644 index 0000000000..91a63627f6 --- /dev/null +++ b/tests/integration/targets/setup_opennebula/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: + - setup_remote_constraints diff --git a/tests/integration/targets/setup_opennebula/tasks/main.yml b/tests/integration/targets/setup_opennebula/tasks/main.yml new file mode 100644 index 0000000000..6d18e147da --- /dev/null +++ b/tests/integration/targets/setup_opennebula/tasks/main.yml @@ -0,0 +1,5 @@ +--- +- name: Install required library + pip: + name: pyone + extra_args: "-c {{ remote_constraints }}" diff --git a/tests/sanity/extra/aliases.py b/tests/sanity/extra/aliases.py index 8791238f5f..d66838b7e0 100755 --- a/tests/sanity/extra/aliases.py +++ b/tests/sanity/extra/aliases.py @@ -41,6 +41,8 @@ def main(): continue if line.startswith('cloud/'): continue + if line.startswith('context/'): + continue if line in ('unsupported', 'disabled', 'hidden'): skip = True if line in ('destructive', ):