Browse Source

Manila-GlusterFS: Removing devstack/pre_, post_ test_hook scripts

As we modified Manila-GlusterFS job definition to use manila/pre_,
post_ test_hook scripts, now devstack/pre_, post_ test_hook scripts
not required.

This patch removes devstack/pre_, post_ test_hook scripts in
devstack/ directory.

Change-Id: I52d962a231c1b2bbc89a160fdc65ea218170a241
Bharat Kumar Kobagana 3 years ago
parent
commit
84f8ac4718
2 changed files with 0 additions and 133 deletions
  1. 0
    85
      devstack/post_test_hook.sh
  2. 0
    48
      devstack/pre_test_hook.sh

+ 0
- 85
devstack/post_test_hook.sh View File

@@ -1,85 +0,0 @@
1
-#!/bin/bash -xe
2
-#
3
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
4
-# not use this file except in compliance with the License. You may obtain
5
-# a copy of the License at
6
-#
7
-# http://www.apache.org/licenses/LICENSE-2.0
8
-#
9
-# Unless required by applicable law or agreed to in writing, software
10
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
11
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
12
-# License for the specific language governing permissions and limitations
13
-# under the License.
14
-
15
-# This script is executed inside post_test_hook function in devstack gate.
16
-
17
-sudo chown -R jenkins:stack $BASE/new/tempest
18
-sudo chown -R jenkins:stack $BASE/data/tempest
19
-sudo chmod -R o+rx $BASE/new/devstack/files
20
-
21
-# Import devstack functions 'iniset'
22
-source $BASE/new/devstack/functions
23
-
24
-
25
-
26
-if [[ "$JOB_NAME" =~ "glusterfs-native" ]]; then
27
-    local BACKEND_NAME="GLUSTERNATIVE"
28
-    iniset $BASE/new/tempest/etc/tempest.conf share enable_protocols glusterfs
29
-    iniset $BASE/new/tempest/etc/tempest.conf share storage_protocol GLUSTERFS
30
-    iniset $BASE/new/tempest/etc/tempest.conf share enable_cert_rules_for_protocols glusterfs
31
-else
32
-    local BACKEND_NAME="GLUSTERFS"
33
-    iniset $BASE/new/tempest/etc/tempest.conf share enable_protocols nfs
34
-    iniset $BASE/new/tempest/etc/tempest.conf share enable_ip_rules_for_protocols nfs
35
-    iniset $BASE/new/tempest/etc/tempest.conf share storage_protocol NFS
36
-fi
37
-
38
-
39
-iniset $BASE/new/tempest/etc/tempest.conf share backend_names $BACKEND_NAME
40
-
41
-# Set two retries for CI jobs
42
-iniset $BASE/new/tempest/etc/tempest.conf share share_creation_retry_number 2
43
-
44
-# Suppress errors in cleanup of resources
45
-SUPPRESS_ERRORS=${SUPPRESS_ERRORS_IN_CLEANUP:-True}
46
-iniset $BASE/new/tempest/etc/tempest.conf share suppress_errors_in_cleanup $SUPPRESS_ERRORS
47
-
48
-
49
-# Disable multi_backend tests
50
-RUN_MANILA_MULTI_BACKEND_TESTS=${RUN_MANILA_MULTI_BACKEND_TESTS:-False}
51
-iniset $BASE/new/tempest/etc/tempest.conf share multi_backend $RUN_MANILA_MULTI_BACKEND_TESTS
52
-
53
-# Disable manage/unmanage tests
54
-RUN_MANILA_MANAGE_TESTS=${RUN_MANILA_MANAGE_TESTS:-False}
55
-iniset $BASE/new/tempest/etc/tempest.conf share run_manage_unmanage_tests $RUN_MANILA_MANAGE_TESTS
56
-
57
-# Disable extend tests
58
-RUN_MANILA_EXTEND_TESTS=${RUN_MANILA_EXTEND_TESTS:-False}
59
-iniset $BASE/new/tempest/etc/tempest.conf share run_extend_tests $RUN_MANILA_EXTEND_TESTS
60
-
61
-# Disable shrink tests
62
-RUN_MANILA_SHRINK_TESTS=${RUN_MANILA_SHRINK_TESTS:-False}
63
-iniset $BASE/new/tempest/etc/tempest.conf share run_shrink_tests $RUN_MANILA_SHRINK_TESTS
64
-
65
-# Disable multi_tenancy tests
66
-iniset $BASE/new/tempest/etc/tempest.conf share multitenancy_enabled False
67
-
68
-# Disable snapshot tests
69
-RUN_MANILA_SNAPSHOT_TESTS=${RUN_MANILA_SNAPSHOT_TESTS:-False}
70
-iniset $BASE/new/tempest/etc/tempest.conf share run_snapshot_tests $RUN_MANILA_SNAPSHOT_TESTS
71
-
72
-# let us control if we die or not
73
-set +o errexit
74
-cd $BASE/new/tempest
75
-
76
-export MANILA_TEMPEST_CONCURRENCY=${MANILA_TEMPEST_CONCURRENCY:-12}
77
-export MANILA_TESTS=${MANILA_TESTS:-'tempest.api.share*'}
78
-
79
-if [[ "$JOB_NAME" =~ "scenario" ]]; then
80
-    echo "Set test set to scenario only"
81
-    MANILA_TESTS='tempest.scenario.*share*'
82
-fi
83
-
84
-echo "Running tempest manila test suites"
85
-sudo -H -u jenkins tox -eall $MANILA_TESTS -- --concurrency=$MANILA_TEMPEST_CONCURRENCY

+ 0
- 48
devstack/pre_test_hook.sh View File

@@ -1,48 +0,0 @@
1
-#!/bin/bash -xe
2
-#
3
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
4
-# not use this file except in compliance with the License. You may obtain
5
-# a copy of the License at
6
-#
7
-# http://www.apache.org/licenses/LICENSE-2.0
8
-#
9
-# Unless required by applicable law or agreed to in writing, software
10
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
11
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
12
-# License for the specific language governing permissions and limitations
13
-# under the License.
14
-
15
-# This script is executed inside pre_test_hook function in devstack gate.
16
-
17
-localrc_path=$BASE/new/devstack/localrc
18
-echo "DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION=1" >> $localrc_path
19
-echo "API_RATE_LIMIT=False" >> $localrc_path
20
-echo "TEMPEST_SERVICES+=,manila" >> $localrc_path
21
-
22
-echo "MANILA_USE_DOWNGRADE_MIGRATIONS=True" >> $localrc_path
23
-
24
-# JOB_NAME is defined in openstack-infra/config project
25
-# used by CI/CD, where this script is intended to be used.
26
-if [[ "$JOB_NAME" =~ "multibackend" ]]; then
27
-    echo "MANILA_MULTI_BACKEND=True" >> $localrc_path
28
-else
29
-    echo "MANILA_MULTI_BACKEND=False" >> $localrc_path
30
-fi
31
-
32
-# Enabling isolated metadata in Neutron is required because
33
-# Tempest creates isolated networks and created vm's in scenario tests don't
34
-# have access to Nova Metadata service. This leads to unavailability of
35
-# created vm's in scenario tests.
36
-echo 'ENABLE_ISOLATED_METADATA=True' >> $localrc_path
37
-
38
-# Go to Tempest dir and checkout stable commit to avoid possible
39
-# incompatibilities for plugin stored in Manila repo.
40
-TEMPEST_COMMIT="489f5e62"  # 15 June, 2015
41
-cd $BASE/new/tempest
42
-git checkout $TEMPEST_COMMIT
43
-
44
-# Print current Tempest status
45
-git status
46
-
47
-# Install Manila Tempest integration
48
-cp -r $BASE/new/manila/contrib/tempest/tempest/* $BASE/new/tempest/tempest

Loading…
Cancel
Save