qa: install/exclude ceph-mgr-ssh package

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>

diff --git a/qa/packages/packages.yaml b/qa/packages/packages.yaml
index c2019ac8271c4e53c5e9bf61f97b9b110b351508..f8c8542002714d4660d240e581855c67038981e6 100644 (file)
--- a/qa/packages/packages.yaml
+++ b/qa/packages/packages.yaml
@@ -41,6 +41,7 @@ ceph:
   - ceph-mgr-diskprediction-cloud
   - ceph-mgr-diskprediction-local
   - ceph-mgr-rook
+  - ceph-mgr-ssh
   - ceph-fuse
   - cephfs-java
   - libcephfs_jni1

diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-luminous.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-luminous.yaml
index 1a364a4da192538649d907da437bcc004994c600..7835cbf93b3bd75704dd66b5439b36b2b05db8ed 100644 (file)
--- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-luminous.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-luminous.yaml
@@ -10,6 +10,7 @@ tasks:
       - ceph-mgr-diskprediction-local
       - ceph-mgr-diskprediction-cloud
       - ceph-mgr-rook
+      - ceph-mgr-ssh
     extra_packages: ['librados2']
 - print: "**** done installing luminous"
 - ceph:

diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-luminous.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-luminous.yaml
index 1a364a4da192538649d907da437bcc004994c600..7835cbf93b3bd75704dd66b5439b36b2b05db8ed 100644 (file)
--- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-luminous.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-luminous.yaml
@@ -10,6 +10,7 @@ tasks:
       - ceph-mgr-diskprediction-local
       - ceph-mgr-diskprediction-cloud
       - ceph-mgr-rook
+      - ceph-mgr-ssh
     extra_packages: ['librados2']
 - print: "**** done installing luminous"
 - ceph:

diff --git a/qa/suites/fs/upgrade/snaps/tasks/0-luminous.yaml b/qa/suites/fs/upgrade/snaps/tasks/0-luminous.yaml
index 1a364a4da192538649d907da437bcc004994c600..7835cbf93b3bd75704dd66b5439b36b2b05db8ed 100644 (file)
--- a/qa/suites/fs/upgrade/snaps/tasks/0-luminous.yaml
+++ b/qa/suites/fs/upgrade/snaps/tasks/0-luminous.yaml
@@ -10,6 +10,7 @@ tasks:
       - ceph-mgr-diskprediction-local
       - ceph-mgr-diskprediction-cloud
       - ceph-mgr-rook
+      - ceph-mgr-ssh
     extra_packages: ['librados2']
 - print: "**** done installing luminous"
 - ceph:

diff --git a/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml b/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml
index bf7c5ee7b424c73e54986d3f6998af7b3c1ef4df..ed620c6852d7443fb72cc411cbe8c2e72f5ac535 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml
@@ -16,6 +16,7 @@ tasks:
       - ceph-mgr-diskprediction-local
       - ceph-mgr-diskprediction-cloud
       - ceph-mgr-rook
+      - ceph-mgr-ssh
       - ceph-mgr
       - libcephfs2
       - libcephfs-devel

diff --git a/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml b/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml
index d64c206109cf3fb4843808ab9950f531f7286997..eae5ffc2677b634e7092f0ad3d0c6bd2490e9fa6 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml
@@ -7,6 +7,7 @@ tasks:
       - ceph-mgr-diskprediction-local
       - ceph-mgr-diskprediction-cloud
       - ceph-mgr-rook
+      - ceph-mgr-ssh
       - ceph-mgr
       - libcephfs2
       - libcephfs-devel

diff --git a/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml b/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml
index c72e59e222c407c1a8b8b2347fbffb91b7c49b01..eb9a3a2ecc7eab32f845f0a9ea1f072a80d4f0f0 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml
@@ -7,6 +7,7 @@ tasks:
       - ceph-mgr-diskprediction-local
       - ceph-mgr-diskprediction-cloud
       - ceph-mgr-rook
+      - ceph-mgr-ssh
     extra_packages: ['librados2']
 - install.upgrade:
     mon.a:

diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/1-install/luminous.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/1-install/luminous.yaml
index f6c1870da38e1071646b6c2df678061c8d119815..ed61af0f1064530e2c1539b6d38f675e620c97d5 100644 (file)
--- a/qa/suites/rados/upgrade/luminous-x-singleton/1-install/luminous.yaml
+++ b/qa/suites/rados/upgrade/luminous-x-singleton/1-install/luminous.yaml
@@ -15,6 +15,7 @@ tasks:
       - ceph-mgr-diskprediction-local
       - ceph-mgr-diskprediction-cloud
       - ceph-mgr-rook
+      - ceph-mgr-ssh
     extra_packages: ['librados2']
 - print: "**** done install luminous"
 - ceph:

diff --git a/qa/suites/upgrade/luminous-x/parallel/1-ceph-install/luminous.yaml b/qa/suites/upgrade/luminous-x/parallel/1-ceph-install/luminous.yaml
index ee7250cdb5e5c904f60901883f21c81e0da37f99..84dbc70ed67cc2c9b17b65b78c0eab66743d4848 100644 (file)
--- a/qa/suites/upgrade/luminous-x/parallel/1-ceph-install/luminous.yaml
+++ b/qa/suites/upgrade/luminous-x/parallel/1-ceph-install/luminous.yaml
@@ -12,6 +12,7 @@ tasks:
       - ceph-mgr-diskprediction-local
       - ceph-mgr-diskprediction-cloud
       - ceph-mgr-rook
+      - ceph-mgr-ssh
     extra_packages: ['librados2']
 - print: "**** done installing luminous"
 - ceph:

diff --git a/qa/suites/upgrade/luminous-x/stress-split/1-ceph-install/luminous.yaml b/qa/suites/upgrade/luminous-x/stress-split/1-ceph-install/luminous.yaml
index cfdc0426368c44efd9c0f3792d887d182b8b6261..65c4398dab9f4f2b92e039b07df619d035c21388 100644 (file)
--- a/qa/suites/upgrade/luminous-x/stress-split/1-ceph-install/luminous.yaml
+++ b/qa/suites/upgrade/luminous-x/stress-split/1-ceph-install/luminous.yaml
@@ -9,6 +9,7 @@ tasks:
       - ceph-mgr-diskprediction-local
       - ceph-mgr-diskprediction-cloud
       - ceph-mgr-rook
+      - ceph-mgr-ssh
     extra_packages: ['librados2']
 - print: "**** done install luminous"
 - ceph:

diff --git a/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml b/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml
index 2edc4a6e602724b872552e625a7f2dd0b352ef11..9cb248b3e5b8a5fc907d0aa7292f8572ed3167c0 100644 (file)
--- a/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml
+++ b/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml
@@ -12,6 +12,7 @@ tasks:
       - ceph-mgr-diskprediction-local
       - ceph-mgr-diskprediction-cloud
       - ceph-mgr-rook
+      - ceph-mgr-ssh
     extra_packages: ['librados2']
 - print: "**** done installing mimic"
 - ceph:

diff --git a/qa/suites/upgrade/mimic-x/stress-split/1-ceph-install/mimic.yaml b/qa/suites/upgrade/mimic-x/stress-split/1-ceph-install/mimic.yaml
index c6598b64b3470fc09eb2b1261ed6451b26e65166..19a4d56355260e6f5bbcf9ee6ed8edfddbb018cf 100644 (file)
--- a/qa/suites/upgrade/mimic-x/stress-split/1-ceph-install/mimic.yaml
+++ b/qa/suites/upgrade/mimic-x/stress-split/1-ceph-install/mimic.yaml
@@ -9,6 +9,7 @@ tasks:
       - ceph-mgr-diskprediction-local
       - ceph-mgr-diskprediction-cloud
       - ceph-mgr-rook
+      - ceph-mgr-ssh
     extra_packages: ['librados2']
 - print: "**** done install mimic"
 - ceph: