From a5838ece305af2a5945fdaca499e8b7172047093 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 29 Aug 2017 13:58:58 -0500 Subject: [PATCH] Remove bindep_command and bindep_fallback references With the settings in site-variables now, we don't need them here. Although these jobs are openstack specific, there's still no need to duplicate ourselves. Change-Id: I1270639344044567a7960d5f8d98afffe69cf092 Depends-On: I94dfe8e6aab9c2da1283590be5e26f7d8c35dcad --- playbooks/python-tarball/pre.yaml | 3 --- playbooks/release/pre.yaml | 6 ------ 2 files changed, 9 deletions(-) diff --git a/playbooks/python-tarball/pre.yaml b/playbooks/python-tarball/pre.yaml index 598638a6..6e971267 100644 --- a/playbooks/python-tarball/pre.yaml +++ b/playbooks/python-tarball/pre.yaml @@ -3,8 +3,5 @@ - role: bindep bindep_profile: test bindep_dir: "src/{{ zuul.project.canonical_name }}" - # TODO(mordred) When we have site-local variables, these should go there - bindep_command: /usr/bindep-env/bin/bindep - bindep_fallback: /usr/local/jenkins/common_data/bindep-fallback.txt - revoke-sudo - ensure-tox diff --git a/playbooks/release/pre.yaml b/playbooks/release/pre.yaml index 52fc8a6b..22719cdd 100644 --- a/playbooks/release/pre.yaml +++ b/playbooks/release/pre.yaml @@ -3,13 +3,7 @@ - role: bindep bindep_profile: test bindep_dir: "src/{{ zuul.project.canonical_name }}" - # TODO(mordred) When we have site-local variables, these should go there - bindep_command: /usr/bindep-env/bin/bindep - bindep_fallback: /usr/local/jenkins/common_data/bindep-fallback.txt - role: bindep bindep_profile: test bindep_dir: src/git.openstack.org/openstack-infra/release-tools - # TODO(mordred) When we have site-local variables, these should go there - bindep_command: /usr/bindep-env/bin/bindep - bindep_fallback: /usr/local/jenkins/common_data/bindep-fallback.txt - revoke-sudo