From 1ea07ceee2e8cad880dd788eecc9aa94efe8b88f Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 17 Oct 2017 16:17:35 +0200 Subject: [PATCH] Update bindep role defaults to be more sane The default for bindep dir should really be zuul.project.src_dir. Also, this is a CI system. Let's default profile to test. Change-Id: Ibc0e7617195865c50ea2bb0e969963f0525ea9b1 --- roles/bindep/README.rst | 3 ++- roles/bindep/defaults/main.yaml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/roles/bindep/README.rst b/roles/bindep/README.rst index 84dc655e3..5f28344a5 100644 --- a/roles/bindep/README.rst +++ b/roles/bindep/README.rst @@ -8,11 +8,12 @@ then install the missing packages. **Role Variables** .. zuul:rolevar:: bindep_dir - :default: . + :default: {{ zuul.project.src_dir }} The directory to look for bindep files in. .. zuul:rolevar:: bindep_profile + :default: test A specific bindep profile to request. diff --git a/roles/bindep/defaults/main.yaml b/roles/bindep/defaults/main.yaml index cb9eb32c2..2438e30bb 100644 --- a/roles/bindep/defaults/main.yaml +++ b/roles/bindep/defaults/main.yaml @@ -1,3 +1,3 @@ --- -bindep_dir: . -bindep_profile: "" +bindep_dir: "{{ zuul.project.src_dir }}" +bindep_profile: test