Merge "Update contrib/ci bash scripts"
This commit is contained in:
commit
97aeaf8ba9
@ -16,6 +16,3 @@
|
||||
|
||||
# Call common pre_test_hook
|
||||
source $BASE/new/manila/contrib/ci/pre_test_hook.sh
|
||||
|
||||
# Redefine exports
|
||||
source $BASE/new/manila/contrib/ci/multi_backend/setup.sh
|
||||
|
@ -1,17 +0,0 @@
|
||||
#!/bin/bash -xe
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
# Call common setup
|
||||
source $BASE/new/manila/contrib/ci/setup.sh
|
||||
export MANILA_MULTI_BACKEND=True
|
@ -14,8 +14,6 @@
|
||||
|
||||
# This script is executed inside pre_test_hook function in devstack gate.
|
||||
|
||||
source $BASE/new/manila/contrib/ci/setup.sh
|
||||
|
||||
# Install manila devstack integration
|
||||
cp -r $BASE/new/manila/contrib/devstack/* $BASE/new/devstack
|
||||
# Install manila tempest integration
|
||||
|
@ -1,28 +0,0 @@
|
||||
#!/bin/bash -xe
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
export DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION=1
|
||||
export DEVSTACK_GATE_NEUTRON=1
|
||||
export KEEP_LOCALRC=1
|
||||
export TEMPEST_SERVICES+=,manila
|
||||
|
||||
export MANILA_MULTI_BACKEND=False
|
||||
export MANILA_BACKEND1_CONFIG_GROUP_NAME=london
|
||||
export MANILA_SHARE_BACKEND1_NAME=LONDON
|
||||
export MANILA_BACKEND2_CONFIG_GROUP_NAME=paris
|
||||
export MANILA_SHARE_BACKEND2_NAME=PARIS
|
||||
|
||||
export API_RATE_LIMIT=False
|
||||
export SHARE_BACKING_FILE_SIZE=20G
|
||||
export VOLUME_BACKING_FILE_SIZE=20G
|
Loading…
Reference in New Issue
Block a user