openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Do not install tempest-horizon from git repo"

Browse Source
This commit is contained in:
Zuul 2021-02-19 04:40:12 +00:00 committed by Gerrit Code Review
commit 947589cb0b
1 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
run_tests.sh
View File

@ -103,17 +103,6 @@ if [[ "${ZUUL_PROJECT}" = "openstack/tempest" ]]; then
fi
if [ -d /home/zuul/src/opendev.org ]; then
# TODO(tkajinam): This should be fixed since the tempest-horizon repo
# has been retired.
# For ubuntu we always need to deploy tempest-horizon from source
if uses_debs; then
if [ -d /home/zuul/src/opendev.org/openstack/tempest-horizon ]; then
[ ! -d /tmp/openstack ] && mkdir -p /tmp/openstack
cp -R /home/zuul/src/opendev.org/openstack/tempest-horizon /tmp/openstack/tempest-horizon
else
git clone https://opendev.org/openstack/tempest-horizon /tmp/openstack/tempest-horizon
fi
fi
if [ "${TEMPEST_FROM_SOURCE}" = true ]; then
if [ -d /home/zuul/src/opendev.org/openstack/tempest ]; then
[ ! -d /tmp/openstack ] && mkdir -p /tmp/openstack
@ -130,13 +119,6 @@ if [ -d /home/zuul/src/opendev.org ]; then
fi
fi
else
# TODO(tkajinam): This should be fixed since the tempest-horizon repo
# has been retired.
# For ubuntu we always need to deploy tempest-horizon from source
if uses_debs; then
$SUDO rm -rf /tmp/openstack/tempest-horizon
git clone https://opendev.org/openstack/tempest-horizon /tmp/openstack/tempest-horizon
fi
if [ "${TEMPEST_FROM_SOURCE}" = true ]; then
$SUDO rm -rf /tmp/openstack/tempest
git clone https://opendev.org/openstack/tempest /tmp/openstack/tempest
@ -264,11 +246,7 @@ $SUDO touch /tmp/openstack/tempest/test-whitelist.txt /tmp/openstack/tempest/tes
$SUDO chown -R "$(id -u):$(id -g)" /tmp/openstack/tempest/
if uses_debs; then
cd /tmp/openstack/tempest-horizon;
pkglist="tempest python3-stestr python3-os-testr python3-tempest"
if [ $(lsb_release --id -s) = "Debian" ] ; then
pkglist="${pkglist} python3-tempest-horizon"
fi
$SUDO apt-get install -y $pkglist
fi