diff options
| author | Yuri Weinstein <yweinste@redhat.com> | 2020-06-26 08:44:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-26 08:44:51 -0700 |
| commit | fb1947143fa826b8c52fbfa1236cf608229abcd5 (patch) | |
| tree | 156dfc59d4a3f13cca035b7c02f18150b7ef1299 | |
| parent | ec03ea106bfc42135c54e7f8444c5b207d5120d9 (diff) | |
| parent | 46f08c6ca1cd90e99701b349bf2f9fd07258bec7 (diff) | |
| download | ceph-fb1947143fa826b8c52fbfa1236cf608229abcd5.tar.gz | |
Merge pull request #35801 from yuriw/wip-yuriw-rgw-octopus
qa/test: fixed s3tests, changed to `force-branch: ceph-octopus`
Reviewed-by: Casey Bodley <cbodley@redhat.com>
| -rw-r--r-- | qa/suites/smoke/basic/tasks/rgw_ec_s3tests.yaml | 2 | ||||
| -rw-r--r-- | qa/suites/smoke/basic/tasks/rgw_s3tests.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qa/suites/smoke/basic/tasks/rgw_ec_s3tests.yaml b/qa/suites/smoke/basic/tasks/rgw_ec_s3tests.yaml index 29a6cec129c..a029c7f9eac 100644 --- a/qa/suites/smoke/basic/tasks/rgw_ec_s3tests.yaml +++ b/qa/suites/smoke/basic/tasks/rgw_ec_s3tests.yaml @@ -9,7 +9,7 @@ tasks: - rgw: [client.0] - s3tests: client.0: - force-branch: ceph-master + force-branch: ceph-octopus rgw_server: client.0 overrides: ceph: diff --git a/qa/suites/smoke/basic/tasks/rgw_s3tests.yaml b/qa/suites/smoke/basic/tasks/rgw_s3tests.yaml index 2ba6a4b497e..c5528b54106 100644 --- a/qa/suites/smoke/basic/tasks/rgw_s3tests.yaml +++ b/qa/suites/smoke/basic/tasks/rgw_s3tests.yaml @@ -5,7 +5,7 @@ tasks: - rgw: [client.0] - s3tests: client.0: - force-branch: ceph-master + force-branch: ceph-octopus rgw_server: client.0 overrides: ceph: |