diff options
| author | Matt Borland <matt.borland@hpe.com> | 2016-07-29 12:29:13 -0600 |
|---|---|---|
| committer | Matt Borland <matt.borland@hpe.com> | 2016-08-11 07:26:34 -0600 |
| commit | 75427ad7f92085310e19551b88ce8ae3354fc4b0 (patch) | |
| tree | d002c9eca8fc23f0621f47fd32d1ba651dea8f84 /tools | |
| parent | f3f2ea1d62638183ccaa7961a79ffc7fe4002fac (diff) | |
| download | horizon-75427ad7f92085310e19551b88ce8ae3354fc4b0.tar.gz | |
Pre-test hook for integration tests/deprecated
We want to allow for integration tests to test deprecated panels. This
means that we need to override the configurations provided by the panels
and force a 'legacy' setting.
On the Infra side, we need to pass in an environment variable that tells this
override to be enabled.
Depends-On: I20232ef16ae60a7151e267b506af471ebfed2f7f
Change-Id: If5a3e273098aa726e12f9076c0273a5afaf233d2
Partially-Implements: blueprint test-deprecated-features
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/gate/integration/post_test_hook.sh | 2 | ||||
| -rwxr-xr-x | tools/gate/integration/pre_test_hook.sh | 17 |
2 files changed, 17 insertions, 2 deletions
diff --git a/tools/gate/integration/post_test_hook.sh b/tools/gate/integration/post_test_hook.sh index 1b3463bd2..2a4414fa1 100755 --- a/tools/gate/integration/post_test_hook.sh +++ b/tools/gate/integration/post_test_hook.sh @@ -17,6 +17,6 @@ sudo -H -E -u stack tox -e py27integration retval=$? if [ -d openstack_dashboard/test/integration_tests/test_reports/ ]; then - cp -r openstack_dashboard/test/integration_tests/test_reports/ /home/jenkins/workspace/gate-horizon-dsvm-integration/ + cp -r openstack_dashboard/test/integration_tests/test_reports/ /home/jenkins/workspace/gate-horizon-dsvm-integration-$1/ fi exit $retval diff --git a/tools/gate/integration/pre_test_hook.sh b/tools/gate/integration/pre_test_hook.sh index 9699c005a..e7787d9a0 100755 --- a/tools/gate/integration/pre_test_hook.sh +++ b/tools/gate/integration/pre_test_hook.sh @@ -4,5 +4,20 @@ set -x -cd /opt/stack/new/horizon/openstack_dashboard/local/local_settings.d +HORIZON_CODE_DIR=/opt/stack/new/horizon + +cd ${HORIZON_CODE_DIR}/openstack_dashboard/local/local_settings.d mv _20_integration_tests_scaffolds.py.example _20_integration_tests_scaffolds.py + +if [ "$1" == "deprecated" ] ; then + +mv _2010_integration_tests_deprecated.py.example _2010_integration_tests_deprecated.py +cat > ${HORIZON_CODE_DIR}/openstack_dashboard/test/integration_tests/local-horizon.conf <<EOF +[image] +panel_type=legacy + +[flavors] +panel_type=legacy +EOF + +fi |