4804dce0b4
This patch contains the following two fixes because the gate job fails if they are not applied at the same time. 1) Use OS::Heat::TestResource in test templates Use OS::Heat::TestResource instead of OS::Nova::Server in heat_minimal.yaml and heat_minimal_hot.yaml 2) Update path to subunit2html in post_test_hook Per: http://lists.openstack.org/pipermail/openstack-dev/2015-August/072982.html The location of subunit2html changed on the images in the gate so update the path used in the post_test_hook. Long-term we should just use what's in devstack-gate. Change-Id: I67acc3145719c3de1199e36c6667d975652d262f Closes-Bug: #1492115 Closes-Bug: #1491646
51 lines
1.7 KiB
Bash
Executable File
51 lines
1.7 KiB
Bash
Executable File
#!/bin/bash -xe
|
|
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
# This script is executed inside post_test_hook function in devstack gate.
|
|
|
|
function generate_testr_results {
|
|
if [ -f .testrepository/0 ]; then
|
|
sudo .tox/functional/bin/testr last --subunit > $WORKSPACE/testrepository.subunit
|
|
sudo mv $WORKSPACE/testrepository.subunit $BASE/logs/testrepository.subunit
|
|
sudo /usr/os-testr-env/bin/subunit2html $BASE/logs/testrepository.subunit $BASE/logs/testr_results.html
|
|
sudo gzip -9 $BASE/logs/testrepository.subunit
|
|
sudo gzip -9 $BASE/logs/testr_results.html
|
|
sudo chown jenkins:jenkins $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz
|
|
sudo chmod a+r $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz
|
|
fi
|
|
}
|
|
|
|
export HEATCLIENT_DIR="$BASE/new/python-heatclient"
|
|
|
|
# Get admin credentials
|
|
cd $BASE/new/devstack
|
|
source openrc admin admin
|
|
|
|
# Go to the heatclient dir
|
|
cd $HEATCLIENT_DIR
|
|
|
|
sudo chown -R jenkins:stack $HEATCLIENT_DIR
|
|
|
|
# Run tests
|
|
echo "Running heatclient functional test suite"
|
|
set +e
|
|
# Preserve env for OS_ credentials
|
|
sudo -E -H -u jenkins tox -efunctional
|
|
EXIT_CODE=$?
|
|
set -e
|
|
|
|
# Collect and parse result
|
|
generate_testr_results
|
|
exit $EXIT_CODE
|