From 6abf3b9160dbdc03819f71b268e7949b9a5424e1 Mon Sep 17 00:00:00 2001 From: vponomaryov Date: Thu, 5 Jun 2014 11:04:25 +0300 Subject: [PATCH] Update contrib/ci bash scripts Actions from setup.sh files are supposed to be moved to job itself. All changes needed only for tempest are stored in post_test_hook. So, no need to keep these files. When files from multi_backend become not used, they should be removed too. Change-Id: I3da41e2843de3e2dfaf4952aea5f7e00a6ff9940 --- contrib/ci/multi_backend/pre_test_hook.sh | 3 --- contrib/ci/multi_backend/setup.sh | 17 -------------- contrib/ci/pre_test_hook.sh | 2 -- contrib/ci/setup.sh | 28 ----------------------- 4 files changed, 50 deletions(-) delete mode 100755 contrib/ci/multi_backend/setup.sh delete mode 100755 contrib/ci/setup.sh diff --git a/contrib/ci/multi_backend/pre_test_hook.sh b/contrib/ci/multi_backend/pre_test_hook.sh index 8eee0490df..5ef8f69f21 100755 --- a/contrib/ci/multi_backend/pre_test_hook.sh +++ b/contrib/ci/multi_backend/pre_test_hook.sh @@ -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 diff --git a/contrib/ci/multi_backend/setup.sh b/contrib/ci/multi_backend/setup.sh deleted file mode 100755 index 38137cf7cf..0000000000 --- a/contrib/ci/multi_backend/setup.sh +++ /dev/null @@ -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 diff --git a/contrib/ci/pre_test_hook.sh b/contrib/ci/pre_test_hook.sh index b3e2994780..a29c519aef 100755 --- a/contrib/ci/pre_test_hook.sh +++ b/contrib/ci/pre_test_hook.sh @@ -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 diff --git a/contrib/ci/setup.sh b/contrib/ci/setup.sh deleted file mode 100755 index ef844507f8..0000000000 --- a/contrib/ci/setup.sh +++ /dev/null @@ -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