qa/rgw: point test repos at ceph-nautilus branch

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml b/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml
index a6ecc649a13bdbdc68966bfb175d5a7f58bde14b..32b0d5f28462d29c59d70037fd8a6e43683cd54c 100644 (file)
--- a/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml
+++ b/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml
@@ -4,12 +4,12 @@ tasks:
 - rgw: [client.0]
 - ragweed:
     client.0:
-      default-branch: ceph-master
+      default-branch: ceph-nautilus
       rgw_server: client.0
       stages: prepare
 - ragweed:
     client.0:
-      default-branch: ceph-master
+      default-branch: ceph-nautilus
       rgw_server: client.0
       stages: check
 overrides:

diff --git a/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml b/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml
index 4cdded04e768a166f187af236bfba07225bbf73b..72bae1ac5dc3e39b96dee6943d27915b710f1540 100644 (file)
--- a/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml
+++ b/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml
@@ -4,7 +4,7 @@ tasks:
 - rgw: [client.0]
 - s3tests:
     client.0:
-      force-branch: ceph-master
+      force-branch: ceph-nautilus
       rgw_server: client.0
 overrides:
   ceph:

diff --git a/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml b/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml
index 45047ea410b4aedc0e34c0d78fb662fe5ef04666..91987ed0c6ae7b9b6201f481f65d4c808e0fdca7 100644 (file)
--- a/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml
+++ b/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml
@@ -1,7 +1,7 @@
 tasks:
 - s3tests:
     client.0:
-      force-branch: ceph-master
+      force-branch: ceph-nautilus
       rgw_server: client.0
 overrides:
   ceph:

diff --git a/qa/suites/rgw/verify/tasks/ragweed.yaml b/qa/suites/rgw/verify/tasks/ragweed.yaml
index 8fbd3cefb928d03ed3f354fdf15e55f44837e60a..3e91afadd349fa4e57aaff70ce9bd1c636efa4fc 100644 (file)
--- a/qa/suites/rgw/verify/tasks/ragweed.yaml
+++ b/qa/suites/rgw/verify/tasks/ragweed.yaml
@@ -1,6 +1,6 @@
 tasks:
 - ragweed:
     client.0:
-      default-branch: ceph-master
+      default-branch: ceph-nautilus
       rgw_server: client.0
       stages: prepare,check

diff --git a/qa/suites/rgw/verify/tasks/s3tests.yaml b/qa/suites/rgw/verify/tasks/s3tests.yaml
index b5aef9b044b83cdb9b28cd40f31b989167d0d069..642aaf2761115b3a92f009f194f6541b966f1639 100644 (file)
--- a/qa/suites/rgw/verify/tasks/s3tests.yaml
+++ b/qa/suites/rgw/verify/tasks/s3tests.yaml
@@ -1,5 +1,5 @@
 tasks:
 - s3tests:
     client.0:
-      force-branch: ceph-master
+      force-branch: ceph-nautilus
       rgw_server: client.0

diff --git a/qa/suites/upgrade/luminous-x/parallel/2-workload/rgw_ragweed_prepare.yaml b/qa/suites/upgrade/luminous-x/parallel/2-workload/rgw_ragweed_prepare.yaml
index ab68649008bf87652e0eba3f20663c7d1a0f37f4..b95711fe3308bfeab2a13867e862903c27127ed7 100644 (file)
--- a/qa/suites/upgrade/luminous-x/parallel/2-workload/rgw_ragweed_prepare.yaml
+++ b/qa/suites/upgrade/luminous-x/parallel/2-workload/rgw_ragweed_prepare.yaml
@@ -8,7 +8,7 @@ workload:
       - client.1
     - ragweed:
         client.1:
-          default-branch: ceph-master
+          default-branch: ceph-nautilus
           rgw_server: client.1
           stages: prepare
     - print: "**** done rgw ragweed prepare 2-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_ragweed_check.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_ragweed_check.yaml
index 7f31cacca6857b4e683bc4ecea7664cf36db5f60..c91d91f6eb5952065a0166d25d667836400e2d9a 100644 (file)
--- a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_ragweed_check.yaml
+++ b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_ragweed_check.yaml
@@ -5,7 +5,7 @@ rgw-final-workload:
   full_sequential:
   - ragweed:
       client.1:
-        default-branch: ceph-master
+        default-branch: ceph-nautilus
         rgw_server: client.1
         stages: check
   - print: "**** done ragweed check 4-final-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_swift.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_swift.yaml
index 45c136fa8f79b64577fd2a38511ba9818ac236b8..e91ccc82e2a171aff50ab5fc5480a31213e420bc 100644 (file)
--- a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_swift.yaml
+++ b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_swift.yaml
@@ -5,6 +5,6 @@ rgw-final-workload:
   full_sequential:
   - swift:
       client.1:
-        force-branch: ceph-master
+        force-branch: ceph-nautilus
         rgw_server: client.1
   - print: "**** done swift 4-final-workload"

diff --git a/qa/suites/upgrade/mimic-x/parallel/2-workload/rgw_ragweed_prepare.yaml b/qa/suites/upgrade/mimic-x/parallel/2-workload/rgw_ragweed_prepare.yaml
index ab68649008bf87652e0eba3f20663c7d1a0f37f4..b95711fe3308bfeab2a13867e862903c27127ed7 100644 (file)
--- a/qa/suites/upgrade/mimic-x/parallel/2-workload/rgw_ragweed_prepare.yaml
+++ b/qa/suites/upgrade/mimic-x/parallel/2-workload/rgw_ragweed_prepare.yaml
@@ -8,7 +8,7 @@ workload:
       - client.1
     - ragweed:
         client.1:
-          default-branch: ceph-master
+          default-branch: ceph-nautilus
           rgw_server: client.1
           stages: prepare
     - print: "**** done rgw ragweed prepare 2-workload"

diff --git a/qa/suites/upgrade/mimic-x/parallel/5-final-workload/rgw_ragweed_check.yaml b/qa/suites/upgrade/mimic-x/parallel/5-final-workload/rgw_ragweed_check.yaml
index 7f31cacca6857b4e683bc4ecea7664cf36db5f60..c91d91f6eb5952065a0166d25d667836400e2d9a 100644 (file)
--- a/qa/suites/upgrade/mimic-x/parallel/5-final-workload/rgw_ragweed_check.yaml
+++ b/qa/suites/upgrade/mimic-x/parallel/5-final-workload/rgw_ragweed_check.yaml
@@ -5,7 +5,7 @@ rgw-final-workload:
   full_sequential:
   - ragweed:
       client.1:
-        default-branch: ceph-master
+        default-branch: ceph-nautilus
         rgw_server: client.1
         stages: check
   - print: "**** done ragweed check 4-final-workload"

diff --git a/qa/suites/upgrade/mimic-x/parallel/5-final-workload/rgw_swift.yaml b/qa/suites/upgrade/mimic-x/parallel/5-final-workload/rgw_swift.yaml
index 45c136fa8f79b64577fd2a38511ba9818ac236b8..e91ccc82e2a171aff50ab5fc5480a31213e420bc 100644 (file)
--- a/qa/suites/upgrade/mimic-x/parallel/5-final-workload/rgw_swift.yaml
+++ b/qa/suites/upgrade/mimic-x/parallel/5-final-workload/rgw_swift.yaml
@@ -5,6 +5,6 @@ rgw-final-workload:
   full_sequential:
   - swift:
       client.1:
-        force-branch: ceph-master
+        force-branch: ceph-nautilus
         rgw_server: client.1
   - print: "**** done swift 4-final-workload"

diff --git a/qa/tasks/swift.py b/qa/tasks/swift.py
index 1966ced3407b096b250b813f6839c7624797c094..09568c011f0615a7b74fe5dc694a901e05a72f1d 100644 (file)
--- a/qa/tasks/swift.py
+++ b/qa/tasks/swift.py
@@ -29,7 +29,7 @@ def download(ctx, config):
         ctx.cluster.only(client).run(
             args=[
                 'git', 'clone',
-                '-b', cconf.get('force-branch', 'ceph-master'),
+                '-b', cconf.get('force-branch', 'ceph-nautilus'),
                 teuth_config.ceph_git_base_url + 'swift.git',
                 '{tdir}/swift'.format(tdir=testdir),
                 ],