Fix functional testing

Fixes for the functional testing using
devstack.

Change-Id: I3a510b6405464fe966cb7cb5ea0a1321b9e7e34f
This commit is contained in:
Tobias Urdin 2018-09-08 15:48:47 +02:00
parent af88d16028
commit ebb02fde0a
3 changed files with 5 additions and 4 deletions

View File

@ -5,6 +5,7 @@ hacking>=0.12.0,<0.13 # Apache-2.0
openstackdocstheme>=1.5.0 # Apache-2.0
sphinx>=1.2.1,!=1.3b1,<1.4 # BSD
testrepository>=0.0.18 # Apache-2.0/BSD
python-openstackclient>=3.16.1
# Python 2.7 dependencies
mock; python_version < '3.0'

View File

@ -157,7 +157,7 @@ fi
if [[ ${GATE_RUN} == 1 ]]; then
# The Cinder backup service is enabled in the Gate.
if [[ $(cinder backup-list --all-tenants | wc -l) -ne 4 ]]; then
if [[ $(openstack volume backup list --all-projects | wc -l) -ne 1 ]]; then
echo "Not all volume backups were cleaned up"
exit 1
fi

View File

@ -15,7 +15,7 @@
export OSPURGE_DIR="$BASE/new/ospurge"
cd $OSPURGE_DIR
sudo chown -R jenkins:stack $OSPURGE_DIR
sudo chown -R stack:stack $OSPURGE_DIR
CLOUDS_YAML=/etc/openstack/clouds.yaml
@ -23,13 +23,13 @@ if [ ! -e ${CLOUDS_YAML} ]; then
# stable/liberty had clouds.yaml in the home/base directory
sudo mkdir -p /etc/openstack
sudo cp $BASE/new/.config/openstack/clouds.yaml ${CLOUDS_YAML}
sudo chown -R jenkins:stack /etc/openstack
sudo chown -R stack:stack /etc/openstack
fi
echo "Running OSpurge functional test suite"
set +e
sudo -E -H -u jenkins tox -e functional
sudo -E -H -u stack tox -e functional
EXIT_CODE=$?
set -e