From 5cbdf32430e678144491177fb8856f1d65555016 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 8 Feb 2019 12:59:14 -0600 Subject: [PATCH] qa/suites: exclude new packages when installing old versions Signed-off-by: Sage Weil --- .../old_client/tasks/0-luminous.yaml | 6 +++++- .../upgraded_client/tasks/0-luminous.yaml | 6 +++++- qa/suites/fs/upgrade/snaps/tasks/0-luminous.yaml | 6 +++++- .../rados/thrash-old-clients/1-install/hammer.yaml | 11 ++++++++++- .../rados/thrash-old-clients/1-install/jewel.yaml | 10 +++++++++- .../rados/thrash-old-clients/1-install/luminous.yaml | 6 +++++- .../luminous-x-singleton/1-install/luminous.yaml | 6 +++++- .../luminous-x/parallel/1-ceph-install/luminous.yaml | 6 +++++- .../stress-split/1-ceph-install/luminous.yaml | 6 +++++- .../mimic-x/parallel/1-ceph-install/mimic.yaml | 6 +++++- .../mimic-x/stress-split/1-ceph-install/mimic.yaml | 6 +++++- 11 files changed, 64 insertions(+), 11 deletions(-) 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 9265bf4b48bff..629af5a78d048 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 @@ -4,7 +4,11 @@ meta: tasks: - install: branch: luminous - exclude_packages: ['librados3'] + exclude_packages: + - librados3 + - ceph-mgr-diskprediction-local + - ceph-mgr-diskprediction-cloud + - ceph-mgr-rook 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 9265bf4b48bff..629af5a78d048 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 @@ -4,7 +4,11 @@ meta: tasks: - install: branch: luminous - exclude_packages: ['librados3'] + exclude_packages: + - librados3 + - ceph-mgr-diskprediction-local + - ceph-mgr-diskprediction-cloud + - ceph-mgr-rook 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 9265bf4b48bff..629af5a78d048 100644 --- a/qa/suites/fs/upgrade/snaps/tasks/0-luminous.yaml +++ b/qa/suites/fs/upgrade/snaps/tasks/0-luminous.yaml @@ -4,7 +4,11 @@ meta: tasks: - install: branch: luminous - exclude_packages: ['librados3'] + exclude_packages: + - librados3 + - ceph-mgr-diskprediction-local + - ceph-mgr-diskprediction-cloud + - ceph-mgr-rook 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 ef6d381c91b93..60093ca85f04f 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml @@ -10,7 +10,16 @@ tasks: - install: branch: hammer downgrade_packages: ['librbd1', 'librados2'] - exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev', 'librados3', 'libradospp-devel'] + exclude_packages: + - librados3 + - ceph-mgr-diskprediction-local + - ceph-mgr-diskprediction-cloud + - ceph-mgr-rook + - ceph-mgr + - libcephfs2 + - libcephfs-devel + - libcephfs-dev + - libradospp-devel extra_packages: ['librados2'] - install.upgrade: mon.a: 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 0238b4636fa4d..c38d57af40d58 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml @@ -1,7 +1,15 @@ tasks: - install: branch: jewel - exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev', 'librados3'] + exclude_packages: + - librados3 + - ceph-mgr-diskprediction-local + - ceph-mgr-diskprediction-cloud + - ceph-mgr-rook + - ceph-mgr + - libcephfs2 + - libcephfs-devel + - libcephfs-dev extra_packages: ['librados2'] - install.upgrade: mon.a: 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 6bd72a0fc06cc..5849e990ba6c5 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml @@ -1,7 +1,11 @@ tasks: - install: branch: luminous - exclude_packages: ['librados3'] + exclude_packages: + - librados3 + - ceph-mgr-diskprediction-local + - ceph-mgr-diskprediction-cloud + - ceph-mgr-rook 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 9332a0ef0f54d..878263803db6f 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 @@ -8,7 +8,11 @@ meta: tasks: - install: branch: luminous - exclude_packages: ['librados3'] + exclude_packages: + - librados3 + - ceph-mgr-diskprediction-local + - ceph-mgr-diskprediction-cloud + - ceph-mgr-rook 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 09b6a08e51af3..3672828b74317 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 @@ -6,7 +6,11 @@ meta: tasks: - install: branch: luminous - exclude_packages: ['librados3'] + exclude_packages: + - librados3 + - ceph-mgr-diskprediction-local + - ceph-mgr-diskprediction-cloud + - ceph-mgr-rook 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 127031c3fa24a..982862f46757a 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 @@ -3,7 +3,11 @@ meta: tasks: - install: branch: luminous - exclude_packages: ['librados3'] + exclude_packages: + - librados3 + - ceph-mgr-diskprediction-local + - ceph-mgr-diskprediction-cloud + - ceph-mgr-rook 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 f5f1e39559620..5f420b099b2d8 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 @@ -6,7 +6,11 @@ meta: tasks: - install: branch: mimic - exclude_packages: ['librados3'] + exclude_packages: + - librados3 + - ceph-mgr-diskprediction-local + - ceph-mgr-diskprediction-cloud + - ceph-mgr-rook 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 ec9f3bee75ac6..0a50078b237b4 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 @@ -3,7 +3,11 @@ meta: tasks: - install: branch: mimic - exclude_packages: ['librados3'] + exclude_packages: + - librados3 + - ceph-mgr-diskprediction-local + - ceph-mgr-diskprediction-cloud + - ceph-mgr-rook extra_packages: ['librados2'] - print: "**** done install mimic" - ceph: -- 2.39.5