From 44a6bc916d0656a3e72cf64b2c10b4b18aba82d6 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Tue, 5 Sep 2017 15:18:26 -0400 Subject: [PATCH] Use ensure-tox role from zuul-jobs We have a role to handle this, lets us it. Change-Id: I471a852a1d01ef79d7f1408176b72c1db3663a8c Signed-off-by: Paul Belanger --- playbooks/python-docs/pre.yaml | 1 + playbooks/python-docs/run.yaml | 4 ---- playbooks/python-tarball/pre.yaml | 1 + playbooks/python-tarball/run.yaml | 4 ---- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/playbooks/python-docs/pre.yaml b/playbooks/python-docs/pre.yaml index 1454a79728..ded21cd6f7 100644 --- a/playbooks/python-docs/pre.yaml +++ b/playbooks/python-docs/pre.yaml @@ -3,4 +3,5 @@ - role: bindep bindep_profile: test bindep_dir: "src/{{ zuul.project.canonical_name }}" + - ensure-tox - revoke-sudo diff --git a/playbooks/python-docs/run.yaml b/playbooks/python-docs/run.yaml index ef1fde2f21..2d5dfa3aeb 100644 --- a/playbooks/python-docs/run.yaml +++ b/playbooks/python-docs/run.yaml @@ -1,7 +1,3 @@ - hosts: all - pre_tasks: - - name: Ensure tox is installed - shell: type tox || pip install --user tox - roles: - role: tox diff --git a/playbooks/python-tarball/pre.yaml b/playbooks/python-tarball/pre.yaml index e043c8831b..8b0a401f86 100644 --- a/playbooks/python-tarball/pre.yaml +++ b/playbooks/python-tarball/pre.yaml @@ -5,4 +5,5 @@ bindep_dir: "src/{{ zuul.project.canonical_name }}" bindep_command: /usr/bindep-env/bin/bindep bindep_fallback: /usr/local/jenkins/common_data/bindep-fallback.txt + - ensure-tox - revoke-sudo diff --git a/playbooks/python-tarball/run.yaml b/playbooks/python-tarball/run.yaml index 9600c11ac4..0f3fcfb8bd 100644 --- a/playbooks/python-tarball/run.yaml +++ b/playbooks/python-tarball/run.yaml @@ -1,8 +1,4 @@ - hosts: all - pre_tasks: - - name: Ensure tox is installed - shell: type tox || pip install --user tox - roles: - role: tox tox_extra_args: -vv python setup.py sdist