From: Casey Bodley Date: Mon, 25 Mar 2019 15:11:16 +0000 (-0400) Subject: qa/rgw: point test repos at ceph-nautilus branch X-Git-Tag: v14.2.1~105^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F27161%2Fhead;p=ceph.git qa/rgw: point test repos at ceph-nautilus branch Signed-off-by: Casey Bodley --- diff --git a/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml b/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml index a6ecc649a13..32b0d5f2846 100644 --- 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 4cdded04e76..72bae1ac5dc 100644 --- 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 45047ea410b..91987ed0c6a 100644 --- 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 8fbd3cefb92..3e91afadd34 100644 --- 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 b5aef9b044b..642aaf27611 100644 --- 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 ab68649008b..b95711fe330 100644 --- 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 7f31cacca68..c91d91f6eb5 100644 --- 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 45c136fa8f7..e91ccc82e2a 100644 --- 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 ab68649008b..b95711fe330 100644 --- 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 7f31cacca68..c91d91f6eb5 100644 --- 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 45c136fa8f7..e91ccc82e2a 100644 --- 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 1966ced3407..09568c011f0 100644 --- 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), ],