From 2d63624d19194d3789f3569880e24e6ceaefec55 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Thu, 26 Mar 2020 20:04:30 -0400 Subject: [PATCH] qa/tests: skip python-ceph during upgrade Octopus is python3-only so there are no python 2 packages to install. Signed-off-by: Josh Durgin --- qa/packages/packages.yaml | 10 ++-------- .../rbd/1-install/luminous-client-x.yaml | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/qa/packages/packages.yaml b/qa/packages/packages.yaml index 4a796a14d7c..6d5f7b09a7f 100644 --- a/qa/packages/packages.yaml +++ b/qa/packages/packages.yaml @@ -8,10 +8,7 @@ ceph: - ceph-fuse - ceph-test - radosgw - - python-rbd - - python-rgw - - python-rados - - python-cephfs + - python-ceph - libcephfs2 - libcephfs-dev - librados2 @@ -43,9 +40,6 @@ ceph: - libcephfs-devel - librados2 - librbd1 - - python-rbd - - python-rgw - - python-rados - - python-cephfs + - python-ceph - rbd-fuse - ceph-debuginfo diff --git a/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/rbd/1-install/luminous-client-x.yaml b/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/rbd/1-install/luminous-client-x.yaml index 463bb5c6e23..860da21be2b 100644 --- a/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/rbd/1-install/luminous-client-x.yaml +++ b/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/rbd/1-install/luminous-client-x.yaml @@ -4,7 +4,7 @@ tasks: exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev','python34-cephfs','python34-rados'] - print: "**** done install luminous" - install.upgrade: - exclude_packages: ['ceph-test', 'ceph-test-dbg','libcephfs1'] + exclude_packages: ['ceph-test', 'ceph-test-dbg','libcephfs1', 'python-ceph'] client.1: - print: "**** done install.upgrade to -x on client.0" - ceph: -- 2.47.3