Commit f2b2670c authored by Zuul's avatar Zuul Committed by Gerrit Code Review

Merge "Make ceph tests more portable"

parents 6271d88f db8b0b6b
......@@ -22,3 +22,4 @@ subunit.log
test/probe/.noseids
RELEASENOTES.rst
releasenotes/notes/reno.cache
/tools/playbooks/**/*.retry
......@@ -272,6 +272,7 @@
pre-run:
- tools/playbooks/common/install_dependencies.yaml
- tools/playbooks/saio_single_node_setup/setup_saio.yaml
- tools/playbooks/saio_single_node_setup/add_s3api.yaml
- tools/playbooks/saio_single_node_setup/make_rings.yaml
run: tools/playbooks/ceph-s3tests/run.yaml
post-run:
......
......@@ -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
# Copyright (c) 2018 OpenStack Foundation
#
# 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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment