From: Yuri Weinstein <yweinste@redhat.com>
Date: Fri, 26 Jun 2020 13:47:42 +0000 (-0700)
Subject: qa/test: fixed s3tests, changed to `force-branch: ceph-octopus`
X-Git-Tag: v15.2.4~2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F35801%2Fhead;p=ceph.git

qa/test: fixed s3tests, changed to `force-branch: ceph-octopus`

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
---

diff --git a/qa/suites/smoke/basic/tasks/rgw_ec_s3tests.yaml b/qa/suites/smoke/basic/tasks/rgw_ec_s3tests.yaml
index 29a6cec129c0..a029c7f9eaca 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 2ba6a4b497e0..c5528b54106c 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: