From 6a8e17bf61fdf020dfe9d8923b40c66ed10ef64c Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Fri, 14 Jul 2017 16:20:17 -0700 Subject: [PATCH] Use zuul-jobs style var names in run-docs This job still needs to be updated to replace the jenkins script with ansible. But so that we can go ahead and remove the zuul_workspace_root variable from everywhere, replace it with the variables that we use for the tox jobs in zuul-jobs. Change-Id: I991dc6c60fb7290be40e8d89ab2cdeb7ab8879c4 --- roles/run-docs/defaults/main.yaml | 3 ++- roles/run-docs/tasks/main.yaml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/roles/run-docs/defaults/main.yaml b/roles/run-docs/defaults/main.yaml index f64d0f12..7a8e4426 100644 --- a/roles/run-docs/defaults/main.yaml +++ b/roles/run-docs/defaults/main.yaml @@ -1,2 +1,3 @@ --- -envlist: venv +tox_envlist: venv +zuul_work_dir: "src/{{ zuul.project.canonical_name }}" diff --git a/roles/run-docs/tasks/main.yaml b/roles/run-docs/tasks/main.yaml index ae828a6c..39668a62 100644 --- a/roles/run-docs/tasks/main.yaml +++ b/roles/run-docs/tasks/main.yaml @@ -1,4 +1,4 @@ - name: Execute run-docs.sh. - shell: "/usr/local/jenkins/slave_scripts/run-docs.sh {{ envlist }}" + shell: "/usr/local/jenkins/slave_scripts/run-docs.sh {{ tox_envlist }}" args: - chdir: "{{ zuul_workspace_root }}/src/{{ zuul.project.canonical_name }}" + chdir: "{{ zuul_work_dir }}"