From 5f6baf62961c6f656e80b8179319e13e0dd1ab27 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Wed, 29 Apr 2020 13:17:37 -0400 Subject: [PATCH] Add pip-and-virtualenv dependency for DIBs Logic has been updated and we now need to force pip to be installed via this element. Change-Id: Ie57df132eb4815202fc29b94f2858cf3fc1dc57b Signed-off-by: Paul Belanger --- nodepool/elements/zuul-worker/element-deps | 1 + nodepool/elements/zuul-worker/install.d/10-pip-packages | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 nodepool/elements/zuul-worker/element-deps diff --git a/nodepool/elements/zuul-worker/element-deps b/nodepool/elements/zuul-worker/element-deps new file mode 100644 index 0000000..7c8922a --- /dev/null +++ b/nodepool/elements/zuul-worker/element-deps @@ -0,0 +1 @@ +pip-and-virtualenv diff --git a/nodepool/elements/zuul-worker/install.d/10-pip-packages b/nodepool/elements/zuul-worker/install.d/10-pip-packages index a8a0192..58bda17 100755 --- a/nodepool/elements/zuul-worker/install.d/10-pip-packages +++ b/nodepool/elements/zuul-worker/install.d/10-pip-packages @@ -23,4 +23,4 @@ set -e # NOTE(pabelanger): This is to work around a bug in the zuul-jobs tox role, this # is because ensure-tox installs into ~/.local/bin however ansible doesn't # incude that within PATH by default. -pip install tox +$DIB_PYTHON_PIP install tox