From 75427ad7f92085310e19551b88ce8ae3354fc4b0 Mon Sep 17 00:00:00 2001 From: Matt Borland Date: Fri, 29 Jul 2016 12:29:13 -0600 Subject: [PATCH] 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 --- ...2010_integration_tests_deprecated.py.example | 6 ++++++ tools/gate/integration/post_test_hook.sh | 2 +- tools/gate/integration/pre_test_hook.sh | 17 ++++++++++++++++- 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 openstack_dashboard/local/local_settings.d/_2010_integration_tests_deprecated.py.example diff --git a/openstack_dashboard/local/local_settings.d/_2010_integration_tests_deprecated.py.example b/openstack_dashboard/local/local_settings.d/_2010_integration_tests_deprecated.py.example new file mode 100644 index 0000000000..e87458a56a --- /dev/null +++ b/openstack_dashboard/local/local_settings.d/_2010_integration_tests_deprecated.py.example @@ -0,0 +1,6 @@ +# This file is to be included for configuring integration tests when +# wanting to only test legacy panels. Since 'local' modules are evaluated +# after settings.py, these configurations will override the default settings. + +HORIZON_CONFIG.update({"images_panel": "legacy"}) +HORIZON_CONFIG.update({"flavors_panel": "legacy"}) diff --git a/tools/gate/integration/post_test_hook.sh b/tools/gate/integration/post_test_hook.sh index 1b3463bd23..2a4414fa1c 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 9699c005a9..e7787d9a0a 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 <