Merge "Pre-test hook for integration tests/deprecated"

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"})

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

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