diff --git a/.zuul.yaml b/.zuul.yaml index 8a29bb836c..bb988505bb 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -242,7 +242,7 @@ COLUMNS: 240 tox_constraints_file: '{{ ansible_user_dir }}/src/opendev.org/openstack/requirements/upper-constraints.txt' # This tox env get run twice; once for Keystone and once for tempauth - tox_envlist: func + tox_envlist: func,s3api devstack_localrc: SWIFT_HASH: changeme # We don't need multiple replicas to run purely functional tests. diff --git a/roles/dsvm-additional-middlewares/tasks/main.yaml b/roles/dsvm-additional-middlewares/tasks/main.yaml index 42db2701c0..7d9f78ac97 100644 --- a/roles/dsvm-additional-middlewares/tasks/main.yaml +++ b/roles/dsvm-additional-middlewares/tasks/main.yaml @@ -21,6 +21,14 @@ value: example.com become: true +- name: Turn on s3_acl_tests_disabled in test.conf (for Keystone tests) + ini_file: + path: /etc/swift/test.conf + section: s3api_test + option: s3_acl_tests_disabled + value: true + become: true + - name: Set storage_domain in test/sample.conf (for tempauth tests) ini_file: path: "{{ ansible_env.HOME }}/{{ zuul.project.src_dir }}/test/sample.conf" @@ -29,6 +37,14 @@ value: example.com become: true +- name: Turn on s3_acl_tests_disabled in test/sample.conf (for tempauth tests) + ini_file: + path: "{{ ansible_env.HOME }}/{{ zuul.project.src_dir }}/test/sample.conf" + section: s3api_test + option: s3_acl_tests_disabled + value: true + become: true + - name: Enable object versioning ini_file: path: /etc/swift/proxy-server.conf