From a370eea4756156b14b60a042d1a026cb394a7d90 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Fri, 15 Sep 2017 21:27:50 -0400 Subject: [PATCH] Include playbook variables from file This allows alternate playbooks to share the same variable definitions as the primary crio-integration-playbook. It remains possible to override them via the command-line if needed. Signed-off-by: Chris Evich --- contrib/test/crio-integration-playbook.yaml | 11 +++++------ contrib/test/crio-integration-vars.yaml | 4 ++++ 2 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 contrib/test/crio-integration-vars.yaml diff --git a/contrib/test/crio-integration-playbook.yaml b/contrib/test/crio-integration-playbook.yaml index 4082722e..4fbc3f6a 100644 --- a/contrib/test/crio-integration-playbook.yaml +++ b/contrib/test/crio-integration-playbook.yaml @@ -2,9 +2,8 @@ - hosts: all remote_user: root - vars: - xunit: false - cni_commit: dcf7368eeab15e2affc6256f0bb1e84dd46a34de + vars_files: + - crio-integration-vars.yaml pre_tasks: ## This playbook expects --extra-vars "commit=" ## and either --extra-vars "pullrequest=" or @@ -12,8 +11,8 @@ - assert: that: 'commit is defined and commit | trim' - assert: - that: 'pullrequest is defined and pullrequest | trim' - tags: - - pr + that: 'pullrequest is defined and pullrequest | trim' + tags: + - pr roles: - integration_tests diff --git a/contrib/test/crio-integration-vars.yaml b/contrib/test/crio-integration-vars.yaml new file mode 100644 index 00000000..624810a0 --- /dev/null +++ b/contrib/test/crio-integration-vars.yaml @@ -0,0 +1,4 @@ +--- + +xunit: false +cni_commit: dcf7368eeab15e2affc6256f0bb1e84dd46a34de