Merge "Use demo user and tenant for testing"

This commit is contained in:
Jenkins 2015-08-31 18:58:19 +00:00 committed by Gerrit Code Review
commit 407b9c3c32
2 changed files with 8 additions and 1 deletions

View File

@ -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"

View File

@ -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