From 6eafe0e62080e473f9a2df003bb87613f1c7ed83 Mon Sep 17 00:00:00 2001 From: Timur Sufiev Date: Thu, 31 Dec 2015 13:06:16 +0300 Subject: [PATCH] Run actual integration tests in post-install hook Change-Id: I8baa8783d8bcdf36a45da21b5e68bdea163c7a3a --- sahara_dashboard/test/integration_tests/horizon.conf | 4 ++-- tools/gate/integration/commons | 2 +- tools/gate/integration/post_test_hook.sh | 8 ++++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/sahara_dashboard/test/integration_tests/horizon.conf b/sahara_dashboard/test/integration_tests/horizon.conf index 8c7ea781..a954e436 100644 --- a/sahara_dashboard/test/integration_tests/horizon.conf +++ b/sahara_dashboard/test/integration_tests/horizon.conf @@ -41,14 +41,14 @@ http_image=http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-uec.tar.gz username=demo # API key to use when authenticating. (string value) -password=pass +password=secretadmin # Administrative Username to use for admin API requests. # (string value) admin_username=admin # API key to use when authenticating as admin. (string value) -admin_password=pass +admin_password=secretadmin [scenario] # ssh username for image file (string value) diff --git a/tools/gate/integration/commons b/tools/gate/integration/commons index 8283fb6a..096c165e 100644 --- a/tools/gate/integration/commons +++ b/tools/gate/integration/commons @@ -2,5 +2,5 @@ set -ex -export SAHARA_DASHBOARD_SCREENSHOTS_DIR="integration_tests_screenshots" +export SAHARA_DASHBOARD_SCREENSHOTS_DIR=sahara_dashboard/.tox/py27integration/src/horizon/openstack_dashboard/test/integration_tests/integration_tests_screenshots diff --git a/tools/gate/integration/post_test_hook.sh b/tools/gate/integration/post_test_hook.sh index cf3ddc84..731c4cf0 100755 --- a/tools/gate/integration/post_test_hook.sh +++ b/tools/gate/integration/post_test_hook.sh @@ -4,3 +4,11 @@ set -ex source commons $@ + +cd /opt/stack/new/sahara-dashboard +sudo -H -u stack tox -e py27integration +retval=$? +if [ -d ${SAHARA_DASHBOARD_SCREENSHOTS_DIR}/ ]; then + cp -r ${SAHARA_DASHBOARD_SCREENSHOTS_DIR}/ /home/jenkins/workspace/gate-sahara-dashboard-dsvm-integration/ +fi +exit $retval