From b6e8e8ef22c377e51dc6ef7956120c2a4e0d7f59 Mon Sep 17 00:00:00 2001 From: "Dave Wilde (d34dh0r453)" Date: Thu, 21 Feb 2019 09:49:23 -0600 Subject: [PATCH] Update tests This pins the openstack-ansible-tests to a known working SHA. (cherry picked from commit 284cf7a522cdf21da3fe6daec8d8014a0a039e1e) --- tox.ini | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tox.ini b/tox.ini index fab675b5b..0049ae024 100644 --- a/tox.ini +++ b/tox.ini @@ -30,8 +30,9 @@ setenv = # NOTE(cloudnull): This should be set to "master" as soon the gate is capable of # setting this option. OSA_RELEASE_BRANCH={env:OSA_RELEASE_BRANCH:master} - OSA_TEST_RELEASE=master - UPPER_CONSTRAINTS_FILE=https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h={env:OSA_TEST_RELEASE:master} + OSA_TEST_RELEASE=d90acf00b639496cd0669153534fe5588875f3ee + OSA_UPPER_CONSTRAINTS=377fde64ac16dc94da2e29e16a4102adcc081a6e + UPPER_CONSTRAINTS_FILE=https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h={env:OSA_UPPER_CONSTRAINTS:master} OSA_TEST_DEPS=https://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt?h={env:OSA_TEST_RELEASE:master} OSA_ROLE_REQUIREMENTS=https://git.openstack.org/cgit/openstack/openstack-ansible/plain/ansible-role-requirements.yml?h={env:OSA_RELEASE_BRANCH:master} basepython = python2.7 @@ -87,10 +88,10 @@ commands = commands = bash -c "if [ ! -d "{toxinidir}/tests/common" ]; then \ git clone https://git.openstack.org/openstack/openstack-ansible-tests {toxinidir}/tests/common; \ - pushd {toxinidir}/tests/common; \ - git checkout {env:OSA_TEST_RELEASE:master}; \ - popd; \ - fi" + fi; \ + pushd {toxinidir}/tests/common; \ + git checkout {env:OSA_TEST_RELEASE:master}; \ + popd" [testenv:pep8]