openstack/manila
Code Issues Proposed changes

[Grenade] Switch base to stable/ocata

Browse Source 
We should test two neighbour branches in grenade job.
So, after branching of stable/ocata we should use it as base
for testing of manila migration to current master branch (Pike-dev).

Also, update existing code to be consistent with newer microversion.

Change-Id: Id78c30e2000186958a2eb8f6fd727042d9b31862
This commit is contained in:
Valeriy Ponomaryov 2017-02-09 13:47:49 +02:00
parent 2c139aa9eb
commit f3218a1d42
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
devstack/upgrade/resources.sh
View File

@ -120,17 +120,18 @@ function scenario_1_do_share_with_rules_and_metadata {
while (( wait_timeout > 0 )) ; do while (( wait_timeout > 0 )) ; do
current_state=$( manila access-list $MANILA_GRENADE_SHARE_NAME | \ current_state=$( manila access-list $MANILA_GRENADE_SHARE_NAME | \
grep " $MANILA_GRENADE_ACCESS_TO " | get_field 5 ) grep " $MANILA_GRENADE_ACCESS_TO " | get_field 5 )
if [[ $current_state == 'active' ]]; then case $current_state in
active)
active='true' active='true'
break break;;
elif [[ $current_state == 'creating' || $current_state == 'new' ]]; then creating|new|queued_to_apply|applying)
((wait_timeout-=$MANILA_GRENADE_WAIT_STEP)) ((wait_timeout-=$MANILA_GRENADE_WAIT_STEP))
sleep $MANILA_GRENADE_WAIT_STEP sleep $MANILA_GRENADE_WAIT_STEP;;
elif [[ $current_state == 'error' ]]; then error)
die $LINENO "Failed to create access rule." die $LINENO "Failed to create access rule.";;
else *)
die $LINENO "Should never reach this line." die $LINENO "Should never reach this line.";;
fi esac
done done
if [[ $active == 'true' ]]; then if [[ $active == 'true' ]]; then
echo "Access rule has been created successfully." echo "Access rule has been created successfully."

6
devstack/upgrade/settings
View File

@ -8,17 +8,17 @@ export TARGET_RUN_SMOKE=False
export ENABLE_TEMPEST=False export ENABLE_TEMPEST=False
devstack_localrc base enable_service manila m-api m-shr m-sch m-dat devstack_localrc base enable_service manila m-api m-shr m-sch m-dat
devstack_localrc base enable_plugin manila git://git.openstack.org/openstack/manila stable/newton devstack_localrc base enable_plugin manila git://git.openstack.org/openstack/manila stable/ocata
devstack_localrc base MANILA_UI_ENABLED=False devstack_localrc base MANILA_UI_ENABLED=False
devstack_localrc base OSLO_SERVICE_WORKS=True devstack_localrc base OSLO_SERVICE_WORKS=True
# NOTE(vponomaryov): stable client is used for keeping scenarios stable # NOTE(vponomaryov): stable client is used for keeping scenarios stable
# so they are not broken by changed CLI view. # so they are not broken by changed CLI view.
devstack_localrc base MANILACLIENT_BRANCH="stable/newton" devstack_localrc base MANILACLIENT_BRANCH="stable/ocata"
devstack_localrc target enable_service manila m-api m-shr m-sch m-dat devstack_localrc target enable_service manila m-api m-shr m-sch m-dat
devstack_localrc target enable_plugin manila git://git.openstack.org/openstack/manila devstack_localrc target enable_plugin manila git://git.openstack.org/openstack/manila
devstack_localrc target MANILA_UI_ENABLED=False devstack_localrc target MANILA_UI_ENABLED=False
devstack_localrc target OSLO_SERVICE_WORKS=True devstack_localrc target OSLO_SERVICE_WORKS=True
devstack_localrc target MANILA_USE_DOWNGRADE_MIGRATIONS=False devstack_localrc target MANILA_USE_DOWNGRADE_MIGRATIONS=False
devstack_localrc target MANILACLIENT_BRANCH="stable/newton" devstack_localrc target MANILACLIENT_BRANCH="stable/ocata"