From 3d128d040e0c2f5ef71a636dd6556f1f5956b71a Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 12 Feb 2019 17:14:19 +0800 Subject: [PATCH] qa: exclude new packages when installing old versions ceph-mgr-dashboard is introduced in nautilus, so exclude it when installing old versions. Signed-off-by: Kefu Chai --- 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 8432d25008cb..c2019ac8271c 100644 --- a/qa/packages/packages.yaml +++ b/qa/packages/packages.yaml @@ -37,6 +37,7 @@ ceph: - ceph-test - ceph - ceph-mgr + - ceph-mgr-dashboard - ceph-mgr-diskprediction-cloud - ceph-mgr-diskprediction-local - ceph-mgr-rook 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 629af5a78d04..1a364a4da192 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 @@ -6,6 +6,7 @@ tasks: branch: luminous exclude_packages: - librados3 + - ceph-mgr-dashboard - ceph-mgr-diskprediction-local - ceph-mgr-diskprediction-cloud - ceph-mgr-rook 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 629af5a78d04..1a364a4da192 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 @@ -6,6 +6,7 @@ tasks: branch: luminous exclude_packages: - librados3 + - ceph-mgr-dashboard - ceph-mgr-diskprediction-local - ceph-mgr-diskprediction-cloud - ceph-mgr-rook diff --git a/qa/suites/fs/upgrade/snaps/tasks/0-luminous.yaml b/qa/suites/fs/upgrade/snaps/tasks/0-luminous.yaml index 629af5a78d04..1a364a4da192 100644 --- a/qa/suites/fs/upgrade/snaps/tasks/0-luminous.yaml +++ b/qa/suites/fs/upgrade/snaps/tasks/0-luminous.yaml @@ -6,6 +6,7 @@ tasks: branch: luminous exclude_packages: - librados3 + - ceph-mgr-dashboard - ceph-mgr-diskprediction-local - ceph-mgr-diskprediction-cloud - ceph-mgr-rook 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 60093ca85f04..bf7c5ee7b424 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml @@ -12,6 +12,7 @@ tasks: downgrade_packages: ['librbd1', 'librados2'] exclude_packages: - librados3 + - ceph-mgr-dashboard - ceph-mgr-diskprediction-local - ceph-mgr-diskprediction-cloud - ceph-mgr-rook 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 c38d57af40d5..d64c206109cf 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml @@ -3,6 +3,7 @@ tasks: branch: jewel exclude_packages: - librados3 + - ceph-mgr-dashboard - ceph-mgr-diskprediction-local - ceph-mgr-diskprediction-cloud - ceph-mgr-rook 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 5849e990ba6c..c72e59e222c4 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml @@ -3,6 +3,7 @@ tasks: branch: luminous exclude_packages: - librados3 + - ceph-mgr-dashboard - ceph-mgr-diskprediction-local - ceph-mgr-diskprediction-cloud - ceph-mgr-rook 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 878263803db6..8f23280c8067 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 @@ -10,6 +10,7 @@ tasks: branch: luminous exclude_packages: - librados3 + - ceph-mgr-dashboard - ceph-mgr-diskprediction-local - ceph-mgr-diskprediction-cloud - ceph-mgr-rook 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 3672828b7431..a0b8270d973d 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 @@ -8,6 +8,7 @@ tasks: branch: luminous exclude_packages: - librados3 + - ceph-mgr-dashboard - ceph-mgr-diskprediction-local - ceph-mgr-diskprediction-cloud - ceph-mgr-rook 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 982862f46757..cfdc0426368c 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 @@ -5,6 +5,7 @@ tasks: branch: luminous exclude_packages: - librados3 + - ceph-mgr-dashboard - ceph-mgr-diskprediction-local - ceph-mgr-diskprediction-cloud - ceph-mgr-rook 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 5f420b099b2d..3d978dbb7c7b 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 @@ -8,6 +8,7 @@ tasks: branch: mimic exclude_packages: - librados3 + - ceph-mgr-dashboard - ceph-mgr-diskprediction-local - ceph-mgr-diskprediction-cloud - ceph-mgr-rook 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 0a50078b237b..c6598b64b347 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 @@ -5,6 +5,7 @@ tasks: branch: mimic exclude_packages: - librados3 + - ceph-mgr-dashboard - ceph-mgr-diskprediction-local - ceph-mgr-diskprediction-cloud - ceph-mgr-rook -- 2.47.3