diff options
author | Luigi Toscano <ltoscano@redhat.com> | 2020-08-19 12:22:38 +0200 |
---|---|---|
committer | Luigi Toscano <ltoscano@redhat.com> | 2020-08-19 12:22:38 +0200 |
commit | bb22add60c5d7a206ed8023d78fd155e256253a0 (patch) | |
tree | ae07e2ce88f71b5c7e79acccf609fffa245921e2 /heatclient/tests/functional | |
parent | 670fe7ce2a31f3111bc3fb80dd80a43500daab87 (diff) | |
download | python-heatclient-bb22add60c5d7a206ed8023d78fd155e256253a0.tar.gz |
Native Zuul v3 version of the functional legacy jobvictoria-em2.2.1
Pretty straightforward conversion, and remove the old scripts
which are not needed anymore.
Also, even though OS_TENANT_NAME is still exported,
read OS_PROJECT_NAME as first choice.
Depends-On: https://review.opendev.org/746235
Change-Id: I51314da6d6bf0467308f3598fa9e666655e286d0
Diffstat (limited to 'heatclient/tests/functional')
-rw-r--r-- | heatclient/tests/functional/base.py | 3 | ||||
-rwxr-xr-x | heatclient/tests/functional/hooks/post_test_hook.sh | 50 |
2 files changed, 2 insertions, 51 deletions
diff --git a/heatclient/tests/functional/base.py b/heatclient/tests/functional/base.py index bfa82b9..76ba404 100644 --- a/heatclient/tests/functional/base.py +++ b/heatclient/tests/functional/base.py @@ -34,7 +34,8 @@ class ClientTestBase(base.ClientTestBase): return base.CLIClient( username=os.environ.get('OS_USERNAME'), password=os.environ.get('OS_PASSWORD'), - tenant_name=os.environ.get('OS_TENANT_NAME'), + tenant_name=os.environ.get('OS_PROJECT_NAME', + os.environ.get('OS_TENANT_NAME')), uri=os.environ.get('OS_AUTH_URL'), cli_dir=cli_dir) diff --git a/heatclient/tests/functional/hooks/post_test_hook.sh b/heatclient/tests/functional/hooks/post_test_hook.sh deleted file mode 100755 index afce9af..0000000 --- a/heatclient/tests/functional/hooks/post_test_hook.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/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 $USER:$USER $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 $USER:stack $HEATCLIENT_DIR - -# Run tests -echo "Running heatclient functional test suite" -set +e -# Preserve env for OS_ credentials -sudo -E -H -u $USER tox -efunctional -EXIT_CODE=$? -set -e - -# Collect and parse result -generate_testr_results -exit $EXIT_CODE |