From 74557137f8755efe71067a4650597011e40f3c53 Mon Sep 17 00:00:00 2001 From: Sorin Sbarnea Date: Mon, 31 Dec 2018 16:44:06 +0000 Subject: [PATCH] Eliminate use of ansible include Removes obsoleted ansible syntax and uses current one "include_tasks" is the recommended syntax for performing a dynamic (non-static) include. Change-Id: If17df8c8fa909960743f4a1e6d3bed845209cce7 --- ara/tests/integration/roles/smoke-tests/tasks/main.yml | 6 ++---- ara/tests/unit/common.py | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ara/tests/integration/roles/smoke-tests/tasks/main.yml b/ara/tests/integration/roles/smoke-tests/tasks/main.yml index cb3e1f74..20cc4e8b 100644 --- a/ara/tests/integration/roles/smoke-tests/tasks/main.yml +++ b/ara/tests/integration/roles/smoke-tests/tasks/main.yml @@ -19,7 +19,5 @@ - name: Deferred setup setup: -- include: ara-ops.yml - static: no -- include: test-ops.yml - static: no +- include_tasks: ara-ops.yml +- include_tasks: test-ops.yml diff --git a/ara/tests/unit/common.py b/ara/tests/unit/common.py index 73a1f0ed..16a9e5e1 100644 --- a/ara/tests/unit/common.py +++ b/ara/tests/unit/common.py @@ -62,7 +62,7 @@ def ansible_run(complete=True, failed=False, gather_facts=True, gather_facts: yes tasks: - name: Fake task - include: some/path/main.yml + include_tasks: some/path/main.yml - name: Record something ara_record: