From 4bf6685cb86ab421363e97d7f748c6f7557cb75f Mon Sep 17 00:00:00 2001 From: Al Bailey Date: Wed, 27 Jul 2022 20:38:06 +0000 Subject: [PATCH] STX: Fix zuul breakage pip install started failing back in May. The zuul/zuul project seems to have caused the problem Signed-off-by: Al Bailey Change-Id: Ia23634fb6bdbebb2067a9a998c3ba5f29326589a --- tox.ini | 2 +- zuul.d/jobs.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 5c8593e..a0439e1 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,7 @@ envlist = linters [testenv] basepython = python3 -install_command = pip install {opts} {packages} +install_command = pip install {opts} {packages} deps = -r{toxinidir}/test-requirements.txt [testenv:bindep] diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index f7d971d..8a96a51 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -10,11 +10,11 @@ - openstack/project-config - opendev/system-config - zuul/zuul-jobs - - zuul/zuul nodeset: ubuntu-bionic vars: tox_envlist: linters tox_environment: + #ANSIBLE_ROLES_PATH={env:ANSIBLE_ROLES_PATH:../zuul-jobs/roles:../openstack-zuul-jobs/roles:roles} ANSIBLE_ROLES_PATH: ~/src/opendev.org/starlingx/zuul-jobs/roles:~/src/opendev.org/opendev/base-jobs/roles:~/src/opendev.org/zuul/zuul-jobs/roles:~/src/opendev.org/openstack/openstack-zuul-jobs/roles:~/src/opendev.org/openstack/project-config/roles:~/src/opendev.org/opendev/system-config/roles - job: