Merge "Do not reset tempest version in CI"

This commit is contained in:
Zuul 2021-03-16 00:25:46 +00:00 committed by Gerrit Code Review
commit 0fee3ad167

View File

@ -109,7 +109,6 @@ if [ -d /home/zuul/src/opendev.org ]; then
cp -R /home/zuul/src/opendev.org/openstack/tempest /tmp/openstack/tempest cp -R /home/zuul/src/opendev.org/openstack/tempest /tmp/openstack/tempest
else else
git clone https://opendev.org/openstack/tempest /tmp/openstack/tempest git clone https://opendev.org/openstack/tempest /tmp/openstack/tempest
fi
# Pin Tempest to TEMPEST_VERSION unless we're running inside the # Pin Tempest to TEMPEST_VERSION unless we're running inside the
# openstack/tempest gate. # openstack/tempest gate.
if [[ "${ZUUL_PROJECT}" != "openstack/tempest" ]]; then if [[ "${ZUUL_PROJECT}" != "openstack/tempest" ]]; then
@ -118,6 +117,7 @@ if [ -d /home/zuul/src/opendev.org ]; then
popd popd
fi fi
fi fi
fi
else else
if [ "${TEMPEST_FROM_SOURCE}" = true ]; then if [ "${TEMPEST_FROM_SOURCE}" = true ]; then
$SUDO rm -rf /tmp/openstack/tempest $SUDO rm -rf /tmp/openstack/tempest