From b1bb7c6f8b54664f09651f0b47fd351bd0cbfad8 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 5 Dec 2019 11:26:59 -0500 Subject: [PATCH] qa/rgw: add missing force-branch: ceph-luminous for swift tasks Signed-off-by: Casey Bodley --- .../rados/upgrade/jewel-x-singleton/8-workload/rgw-swift.yaml | 1 + qa/suites/rgw/multifs/tasks/rgw_swift.yaml | 1 + qa/suites/rgw/thrash/workload/rgw_swift.yaml | 1 + qa/suites/rgw/verify/tasks/swift.yaml | 1 + qa/suites/smoke/basic/tasks/rgw_swift.yaml | 1 + .../upgrade/jewel-x/parallel/7-final-workload/rgw_swift.yaml | 1 + .../upgrade/jewel-x/stress-split/7-final-workload/rgw-swift.yaml | 1 + .../upgrade/kraken-x/parallel/7-final-workload/rgw_swift.yaml | 1 + .../kraken-x/stress-split/7-final-workload/rgw-swift.yaml | 1 + .../luminous-p2p-stress-split/7-final-workload/rgw-swift.yaml | 1 + 10 files changed, 10 insertions(+) diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rgw-swift.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rgw-swift.yaml index e41f47ad0db..4a4b48aeb13 100644 --- a/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rgw-swift.yaml +++ b/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rgw-swift.yaml @@ -7,5 +7,6 @@ tasks: - print: "**** done rgw 9-workload" - swift: client.0: + force-branch: ceph-luminous rgw_server: client.0 - print: "**** done swift 9-workload" diff --git a/qa/suites/rgw/multifs/tasks/rgw_swift.yaml b/qa/suites/rgw/multifs/tasks/rgw_swift.yaml index 569741b0e15..4451d152c76 100644 --- a/qa/suites/rgw/multifs/tasks/rgw_swift.yaml +++ b/qa/suites/rgw/multifs/tasks/rgw_swift.yaml @@ -4,4 +4,5 @@ tasks: - rgw: [client.0] - swift: client.0: + force-branch: ceph-luminous rgw_server: client.0 diff --git a/qa/suites/rgw/thrash/workload/rgw_swift.yaml b/qa/suites/rgw/thrash/workload/rgw_swift.yaml index 45e2fc9cc30..61041c648c2 100644 --- a/qa/suites/rgw/thrash/workload/rgw_swift.yaml +++ b/qa/suites/rgw/thrash/workload/rgw_swift.yaml @@ -1,4 +1,5 @@ tasks: - swift: client.0: + force-branch: ceph-luminous rgw_server: client.0 diff --git a/qa/suites/rgw/verify/tasks/swift.yaml b/qa/suites/rgw/verify/tasks/swift.yaml index 45e2fc9cc30..61041c648c2 100644 --- a/qa/suites/rgw/verify/tasks/swift.yaml +++ b/qa/suites/rgw/verify/tasks/swift.yaml @@ -1,4 +1,5 @@ tasks: - swift: client.0: + force-branch: ceph-luminous rgw_server: client.0 diff --git a/qa/suites/smoke/basic/tasks/rgw_swift.yaml b/qa/suites/smoke/basic/tasks/rgw_swift.yaml index 57c7226e341..9add4c00ae1 100644 --- a/qa/suites/smoke/basic/tasks/rgw_swift.yaml +++ b/qa/suites/smoke/basic/tasks/rgw_swift.yaml @@ -5,4 +5,5 @@ tasks: - rgw: [client.0] - swift: client.0: + force-branch: ceph-luminous rgw_server: client.0 diff --git a/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rgw_swift.yaml b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rgw_swift.yaml index 780c4ad7065..d676486c299 100644 --- a/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rgw_swift.yaml +++ b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rgw_swift.yaml @@ -9,5 +9,6 @@ tasks: - print: "**** done rgw 7-final-workload" - swift: client.1: + force-branch: ceph-luminous rgw_server: client.1 - print: "**** done swift 7-final-workload" diff --git a/qa/suites/upgrade/jewel-x/stress-split/7-final-workload/rgw-swift.yaml b/qa/suites/upgrade/jewel-x/stress-split/7-final-workload/rgw-swift.yaml index 76e5d6fc231..aca66ba62a7 100644 --- a/qa/suites/upgrade/jewel-x/stress-split/7-final-workload/rgw-swift.yaml +++ b/qa/suites/upgrade/jewel-x/stress-split/7-final-workload/rgw-swift.yaml @@ -7,5 +7,6 @@ tasks: - print: "**** done rgw 9-workload" - swift: client.0: + force-branch: ceph-luminous rgw_server: client.0 - print: "**** done swift 9-workload" diff --git a/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rgw_swift.yaml b/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rgw_swift.yaml index 7a7659ff4f1..45e9f3a3a37 100644 --- a/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rgw_swift.yaml +++ b/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rgw_swift.yaml @@ -9,5 +9,6 @@ tasks: - print: "**** done rgw 4-final-workload" - swift: client.1: + force-branch: ceph-luminous rgw_server: client.1 - print: "**** done swift 4-final-workload" diff --git a/qa/suites/upgrade/kraken-x/stress-split/7-final-workload/rgw-swift.yaml b/qa/suites/upgrade/kraken-x/stress-split/7-final-workload/rgw-swift.yaml index 76e5d6fc231..aca66ba62a7 100644 --- a/qa/suites/upgrade/kraken-x/stress-split/7-final-workload/rgw-swift.yaml +++ b/qa/suites/upgrade/kraken-x/stress-split/7-final-workload/rgw-swift.yaml @@ -7,5 +7,6 @@ tasks: - print: "**** done rgw 9-workload" - swift: client.0: + force-branch: ceph-luminous rgw_server: client.0 - print: "**** done swift 9-workload" diff --git a/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/7-final-workload/rgw-swift.yaml b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/7-final-workload/rgw-swift.yaml index 76e5d6fc231..aca66ba62a7 100644 --- a/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/7-final-workload/rgw-swift.yaml +++ b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/7-final-workload/rgw-swift.yaml @@ -7,5 +7,6 @@ tasks: - print: "**** done rgw 9-workload" - swift: client.0: + force-branch: ceph-luminous rgw_server: client.0 - print: "**** done swift 9-workload" -- 2.47.3