From 7c4f5e775af8734a85321f6f21a3f2c94075ef63 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 5 Dec 2019 11:21:49 -0500 Subject: [PATCH] qa/rgw: add missing force-branch: ceph-mimic for swift tasks Signed-off-by: Casey Bodley --- .../rados/upgrade/luminous-x-singleton/8-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/5-final-workload/rgw_swift.yaml | 1 + .../upgrade/jewel-x/stress-split/7-final-workload/rgw-swift.yaml | 1 + .../upgrade/kraken-x/parallel/5-final-workload/rgw_swift.yaml | 1 + .../kraken-x/stress-split/7-final-workload/rgw-swift.yaml | 1 + .../luminous-x/stress-split/7-final-workload/rgw-swift.yaml | 1 + .../mimic-p2p-stress-split/7-final-workload/rgw-swift.yaml | 1 + 9 files changed, 9 insertions(+) diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/8-workload/rgw-swift.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/8-workload/rgw-swift.yaml index 76e5d6fc23158..8d25a6d38bed6 100644 --- a/qa/suites/rados/upgrade/luminous-x-singleton/8-workload/rgw-swift.yaml +++ b/qa/suites/rados/upgrade/luminous-x-singleton/8-workload/rgw-swift.yaml @@ -7,5 +7,6 @@ tasks: - print: "**** done rgw 9-workload" - swift: client.0: + force-branch: ceph-mimic rgw_server: client.0 - print: "**** done swift 9-workload" diff --git a/qa/suites/rgw/verify/tasks/swift.yaml b/qa/suites/rgw/verify/tasks/swift.yaml index 45e2fc9cc3088..3d9b397c01dcf 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-mimic 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 57c7226e341e2..32a0dd89fa648 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-mimic rgw_server: client.0 diff --git a/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rgw_swift.yaml b/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rgw_swift.yaml index 7a7659ff4f1c2..5110970a39248 100644 --- a/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rgw_swift.yaml +++ b/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rgw_swift.yaml @@ -9,5 +9,6 @@ tasks: - print: "**** done rgw 4-final-workload" - swift: client.1: + force-branch: ceph-mimic rgw_server: client.1 - print: "**** done swift 4-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 76e5d6fc23158..8d25a6d38bed6 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-mimic rgw_server: client.0 - print: "**** done swift 9-workload" diff --git a/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rgw_swift.yaml b/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rgw_swift.yaml index 7a7659ff4f1c2..5110970a39248 100644 --- a/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rgw_swift.yaml +++ b/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rgw_swift.yaml @@ -9,5 +9,6 @@ tasks: - print: "**** done rgw 4-final-workload" - swift: client.1: + force-branch: ceph-mimic 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 76e5d6fc23158..8d25a6d38bed6 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-mimic rgw_server: client.0 - print: "**** done swift 9-workload" diff --git a/qa/suites/upgrade/luminous-x/stress-split/7-final-workload/rgw-swift.yaml b/qa/suites/upgrade/luminous-x/stress-split/7-final-workload/rgw-swift.yaml index 76e5d6fc23158..8d25a6d38bed6 100644 --- a/qa/suites/upgrade/luminous-x/stress-split/7-final-workload/rgw-swift.yaml +++ b/qa/suites/upgrade/luminous-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-mimic rgw_server: client.0 - print: "**** done swift 9-workload" diff --git a/qa/suites/upgrade/mimic-p2p/mimic-p2p-stress-split/7-final-workload/rgw-swift.yaml b/qa/suites/upgrade/mimic-p2p/mimic-p2p-stress-split/7-final-workload/rgw-swift.yaml index 76e5d6fc23158..8d25a6d38bed6 100644 --- a/qa/suites/upgrade/mimic-p2p/mimic-p2p-stress-split/7-final-workload/rgw-swift.yaml +++ b/qa/suites/upgrade/mimic-p2p/mimic-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-mimic rgw_server: client.0 - print: "**** done swift 9-workload" -- 2.39.5