Make ceph tests more portable

Code Issues Proposed changes

Change-Id: If93325f2651a02f98f9d480c10bf7b849cc9617e

This commit is contained in:

Clay Gerrard

2019年05月10日 13:15:42 -05:00

committed by Tim Burke

parent 5cb53838a6

commit db8b0b6bc4

4 changed files with 37 additions and 12 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

24
tools/playbooks/ceph-s3tests/run.yaml

View File

@@ -14,16 +14,13 @@

# limitations under the License.

- hosts:all

tasks:

# TODO: remove this task when s3api is in the pipeline by default

- name:Add s3api in proxy-server.conf

replace:

path:"/etc/swift/proxy-server.conf"

regexp:"container_sync tempauth"

replace:"container_sync s3api tempauth"

- name:Shutdown main swift services

shell:"swift-init stop main"

become:true

ignore_errors:true

- name:Starts main swift servers

shell:"swift-init main start"

- name:Start main swift services

shell:"swift-init start main"

become:true

- name:Clone s3compat repository

@@ -35,17 +32,18 @@

pip:

requirements:"{{ ansible_env.HOME }}/s3compat/requirements.txt"

virtualenv:"{{ ansible_env.HOME }}/venv"

virtualenv_python:python2

become:true

- name:Run s3compat tests

shell:'{{ ansible_env.HOME }}/venv/bin/python {{ ansible_env.HOME }}/s3compat/bin/run_ceph_tests.py "$@" || true'

shell:'{{ ansible_env.HOME }}/venv/bin/python {{ ansible_env.HOME }}/s3compat/bin/run_ceph_tests.py "$@"'

ignore_errors:true

environment:

S3TEST_CONF:"{{ ansible_env.HOME }}/{{ zuul.project.src_dir }}/tools/playbooks/ceph-s3tests/ceph-s3.conf"

S3ACL:"true"

DNS_BUCKET_NAMES:"false"

CHECK_BUCKET_OWNER:"true"

args:

chdir:'{{ ansible_env.HOME }}/s3compat'

tags:

- tests

- name:Show report

shell:|

@@ -58,3 +56,5 @@

args:

chdir:

"{{ ansible_env.HOME }}/s3compat"

tags:

- tests

23
tools/playbooks/saio_single_node_setup/add_s3api.yaml Normal file

View File

@@ -0,0 +1,23 @@

#

# 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.

- hosts:all

tasks:

# TODO: remove this task when s3api is in the pipeline by default

- name:Add s3api in proxy-server.conf

replace:

path:"/etc/swift/proxy-server.conf"

regexp:"container_sync tempauth"

replace:"container_sync s3api tempauth"

become:true