ceph-deploy: install correct branch for rados api tests

Fixes: #5442
Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/suites/ceph-deploy/rados/tasks/rados_api_tests.yaml b/suites/ceph-deploy/rados/tasks/rados_api_tests.yaml
index 8e99d19c15c3d4af283244a4bfad78591d4488a8..b2137171ca4bc8202075e7132a62d375b8d5802a 100644 (file)
--- a/suites/ceph-deploy/rados/tasks/rados_api_tests.yaml
+++ b/suites/ceph-deploy/rados/tasks/rados_api_tests.yaml
@@ -9,12 +9,12 @@ roles:
 - - client.0
 tasks:
 - install:
+     branch: cuttlefish
      extras: yes
 - ssh_keys:
 - ceph-deploy:
      branch:
         stable: cuttlefish
-- ceph-fuse:
 - workunit:
      branch: cuttlefish
      clients:

diff --git a/suites/ceph-deploy/rados/tasks/rados_python.yaml b/suites/ceph-deploy/rados/tasks/rados_python.yaml
index e24b602a3b32194170bd2ed23971ae6b0b7981ce..aabe035e1987a3a5b2c8da2e42165fd2538f1f16 100644 (file)
--- a/suites/ceph-deploy/rados/tasks/rados_python.yaml
+++ b/suites/ceph-deploy/rados/tasks/rados_python.yaml
@@ -9,6 +9,7 @@ roles:
 - - client.0
 tasks:
 - install:
+     branch: cuttlefish
      extras: yes
 - ssh_keys:
 - ceph-deploy:

diff --git a/suites/ceph-deploy/rados/tasks/rados_workunit_loadgen_big.yaml b/suites/ceph-deploy/rados/tasks/rados_workunit_loadgen_big.yaml
index 029484e6baa70240a5fdeedb27502e912120c768..85b6128ac36ac0081e79d5102ed86bc4cfb043d7 100644 (file)
--- a/suites/ceph-deploy/rados/tasks/rados_workunit_loadgen_big.yaml
+++ b/suites/ceph-deploy/rados/tasks/rados_workunit_loadgen_big.yaml
@@ -9,6 +9,7 @@ roles:
 - - client.0
 tasks:
 - install:
+     branch: cuttlefish
      extras: yes
 - ssh_keys:
 - ceph-deploy:

diff --git a/suites/ceph-deploy/rbd/tasks/rbd_api_tests_old_format.yaml b/suites/ceph-deploy/rbd/tasks/rbd_api_tests_old_format.yaml
index 3cf3e101f1ac41c8b986694aeb90c209fdc3c454..4725e675587c7b937ed71bccb2aec872b5b18448 100644 (file)
--- a/suites/ceph-deploy/rbd/tasks/rbd_api_tests_old_format.yaml
+++ b/suites/ceph-deploy/rbd/tasks/rbd_api_tests_old_format.yaml
@@ -7,6 +7,7 @@ roles:
 - - client.0
 tasks:
 - install:
+     branch: cuttlefish
      extras: yes
 - ssh_keys:
 - ceph-deploy:

diff --git a/suites/ceph-deploy/rbd/tasks/rbd_cli_tests.yaml b/suites/ceph-deploy/rbd/tasks/rbd_cli_tests.yaml
index d1b5a979cd0319bd367f9cf6899edda604659a05..13a622c5b1bdeed32cec28b1589deffb2dff5399 100644 (file)
--- a/suites/ceph-deploy/rbd/tasks/rbd_cli_tests.yaml
+++ b/suites/ceph-deploy/rbd/tasks/rbd_cli_tests.yaml
@@ -7,6 +7,7 @@ roles:
 - - client.0
 tasks:
 - install:
+     branch: cuttlefish
      extras: yes
 - ssh_keys:
 - ceph-deploy:

diff --git a/suites/ceph-deploy/rbd/tasks/rbd_cls_test.yaml b/suites/ceph-deploy/rbd/tasks/rbd_cls_test.yaml
index fe8ead7fc5ecdd8295e2860b5cd45d73afa21bc1..d5badc32b4d217503af72e469e784afffc885c3e 100644 (file)
--- a/suites/ceph-deploy/rbd/tasks/rbd_cls_test.yaml
+++ b/suites/ceph-deploy/rbd/tasks/rbd_cls_test.yaml
@@ -7,6 +7,7 @@ roles:
 - - client.0
 tasks:
 - install:
+     branch: cuttlefish
      extras: yes
 - ssh_keys:
 - ceph-deploy:

diff --git a/suites/ceph-deploy/rbd/tasks/rbd_python_api_tests.yaml b/suites/ceph-deploy/rbd/tasks/rbd_python_api_tests.yaml
index 06f6dba507519f2ed5122f732593e154d72e7e04..e63dc48c6f602b9662355f987af47d7126278abd 100644 (file)
--- a/suites/ceph-deploy/rbd/tasks/rbd_python_api_tests.yaml
+++ b/suites/ceph-deploy/rbd/tasks/rbd_python_api_tests.yaml
@@ -8,6 +8,7 @@ roles:
 - - client.0
 tasks:
 - install:
+     branch: cuttlefish
      extras: yes
 - ssh_keys:
 - ceph-deploy: