diff options
author | Zuul <zuul@review.opendev.org> | 2019-09-25 00:31:51 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2019-09-25 00:31:51 +0000 |
commit | f2b2670c658e430e756afd0dc05b7180109bd7af (patch) | |
tree | 723dc2e1df10fc89bdaf04751350abef257bd165 | |
parent | 6271d88f9ed5e98f989a6739a75b268537fe0521 (diff) | |
parent | db8b0b6bc46a67b03af415d4e5e1429cc7d73bba (diff) | |
download | swift-f2b2670c658e430e756afd0dc05b7180109bd7af.tar.gz |
Merge "Make ceph tests more portable"
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | .zuul.yaml | 1 | ||||
-rw-r--r-- | tools/playbooks/ceph-s3tests/run.yaml | 24 | ||||
-rw-r--r-- | tools/playbooks/saio_single_node_setup/add_s3api.yaml | 23 |
4 files changed, 37 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore index bee70b731..b989cd547 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ subunit.log test/probe/.noseids RELEASENOTES.rst releasenotes/notes/reno.cache +/tools/playbooks/**/*.retry diff --git a/.zuul.yaml b/.zuul.yaml index 1b66cfb33..1e1debfba 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -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: diff --git a/tools/playbooks/ceph-s3tests/run.yaml b/tools/playbooks/ceph-s3tests/run.yaml index 4932ffc2b..528853382 100644 --- a/tools/playbooks/ceph-s3tests/run.yaml +++ b/tools/playbooks/ceph-s3tests/run.yaml @@ -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 diff --git a/tools/playbooks/saio_single_node_setup/add_s3api.yaml b/tools/playbooks/saio_single_node_setup/add_s3api.yaml new file mode 100644 index 000000000..cde368cd7 --- /dev/null +++ b/tools/playbooks/saio_single_node_setup/add_s3api.yaml @@ -0,0 +1,23 @@ +# 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 |