From c5c28361cc9591795a041a263044128f78c1a09f Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Sun, 23 Aug 2015 23:36:58 +0300 Subject: [PATCH] Use demo user and tenant for testing It will allow us to test how Sahara works for non-admin user. Register image in Sahara under admin user and make it public. Change-Id: Iae0684d865951e8bd419498a3de4e50c603b61ae --- tools/gate/scenario/commons | 3 ++- tools/gate/scenario/post_test_hook.sh | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/gate/scenario/commons b/tools/gate/scenario/commons index 30d4cb76..a296c8b0 100644 --- a/tools/gate/scenario/commons +++ b/tools/gate/scenario/commons @@ -33,7 +33,8 @@ export LOCALRC_PATH=$DEVSTACK_DIR/localrc export LOCALCONF_PATH=$DEVSTACK_DIR/local.conf function sahara_register_fake_plugin_image { - local props="--property _sahara_tag_0.1=True" + local props="--public" + props+=" --property _sahara_tag_0.1=True" props+=" --property _sahara_tag_fake=True" props+=" --property _sahara_username=$SAHARA_FAKE_PLUGIN_IMAGE_USERNAME" diff --git a/tools/gate/scenario/post_test_hook.sh b/tools/gate/scenario/post_test_hook.sh index 8821e825..506c5c8a 100755 --- a/tools/gate/scenario/post_test_hook.sh +++ b/tools/gate/scenario/post_test_hook.sh @@ -26,8 +26,14 @@ source $DEVSTACK_DIR/stackrc source $DEVSTACK_DIR/openrc admin admin set -x +# Make public and register in Sahara as admin sahara_register_fake_plugin_image +# Use demo user for running scenario tests +set +x +source $DEVSTACK_DIR/openrc demo demo +set -x + sudo -E chown -R jenkins:stack $SAHARA_DIR cd $SAHARA_DIR