openstack/deb-sahara
Code Issues Proposed changes

Merge "Use custom flavor in gate"

Browse Source
This commit is contained in:
Jenkins 2015-09-10 17:29:15 +00:00 committed by Gerrit Code Review
commit 80974a2cb2
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/gate/scenario/commons
View File

@ -41,3 +41,8 @@ function sahara_register_fake_plugin_image {
openstack --os-url $GLANCE_SERVICE_PROTOCOL://$GLANCE_HOSTPORT image set \
$SAHARA_FAKE_PLUGIN_IMAGE_NAME $props
}
function sahara_register_flavor {
nova flavor-create $SAHARA_FLAVOR_NAME $SAHARA_FLAVOR_ID $SAHARA_FLAVOR_RAM \
$SAHARA_FLAVOR_DISK $SAHARA_FLAVOR_VCPUS
}

5
tools/gate/scenario/post_test_hook.sh
View File

@ -29,6 +29,9 @@ set -x
# Make public and register in Sahara as admin
sahara_register_fake_plugin_image
# Register sahara specific flavor for gate
sahara_register_flavor
# Use demo user for running scenario tests
set +x
source $DEVSTACK_DIR/openrc demo demo
@ -48,7 +51,7 @@ network_type: ${NETWORK}
network_private_name: ${PRIVATE_NETWORK_NAME}
network_public_name: ${PUBLIC_NETWORK_NAME}
fake_plugin_image: ${SAHARA_FAKE_PLUGIN_IMAGE_NAME}
ci_flavor_id: '1'
ci_flavor_id: '${SAHARA_FLAVOR_ID}'
cluster_name: fake-cluster
EOF

5
tools/gate/scenario/settings
View File

@ -19,3 +19,8 @@
export SAHARA_FAKE_PLUGIN_IMAGE=http://tarballs.openstack.org/heat-test-image/fedora-heat-test-image.qcow2
export SAHARA_FAKE_PLUGIN_IMAGE_NAME=$(basename $SAHARA_FAKE_PLUGIN_IMAGE .qcow2)
export SAHARA_FAKE_PLUGIN_IMAGE_USERNAME=fedora
export SAHARA_FLAVOR_NAME=sahara-flavor
export SAHARA_FLAVOR_ID=20
export SAHARA_FLAVOR_RAM=512
export SAHARA_FLAVOR_DISK=4
export SAHARA_FLAVOR_VCPUS=1