From a2e89600799a719f6a672179b216d406c7d6b234 Mon Sep 17 00:00:00 2001 From: Noah Watkins Date: Thu, 14 Feb 2019 12:10:24 -0800 Subject: [PATCH] qa: install/exclude ceph-mgr-ssh package Signed-off-by: Noah Watkins --- qa/packages/packages.yaml | 1 + .../upgrade/featureful_client/old_client/tasks/0-luminous.yaml | 1 + .../featureful_client/upgraded_client/tasks/0-luminous.yaml | 1 + qa/suites/fs/upgrade/snaps/tasks/0-luminous.yaml | 1 + qa/suites/rados/thrash-old-clients/1-install/hammer.yaml | 1 + qa/suites/rados/thrash-old-clients/1-install/jewel.yaml | 1 + qa/suites/rados/thrash-old-clients/1-install/luminous.yaml | 1 + .../rados/upgrade/luminous-x-singleton/1-install/luminous.yaml | 1 + .../upgrade/luminous-x/parallel/1-ceph-install/luminous.yaml | 1 + .../upgrade/luminous-x/stress-split/1-ceph-install/luminous.yaml | 1 + qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml | 1 + qa/suites/upgrade/mimic-x/stress-split/1-ceph-install/mimic.yaml | 1 + 12 files changed, 12 insertions(+) diff --git a/qa/packages/packages.yaml b/qa/packages/packages.yaml index c2019ac8271c4..f8c8542002714 100644 --- 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 1a364a4da1925..7835cbf93b3bd 100644 --- 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 1a364a4da1925..7835cbf93b3bd 100644 --- 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 1a364a4da1925..7835cbf93b3bd 100644 --- 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 bf7c5ee7b424c..ed620c6852d74 100644 --- 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 d64c206109cf3..eae5ffc2677b6 100644 --- 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 c72e59e222c40..eb9a3a2ecc7ea 100644 --- 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 f6c1870da38e1..ed61af0f10645 100644 --- 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 ee7250cdb5e5c..84dbc70ed67cc 100644 --- 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 cfdc0426368c4..65c4398dab9f4 100644 --- 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 2edc4a6e60272..9cb248b3e5b8a 100644 --- 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 c6598b64b3470..19a4d56355260 100644 --- 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: -- 2.39.5