From 877edb99b1c49ad9133f06430c467192c6f6bb7a Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Mon, 12 Feb 2018 23:21:10 +0100 Subject: [PATCH] tests: client-upgrade-kraken: upgrade ceph-test, too Upgrade test was failing because, in luminous and above, three files were moved from ceph-test to ceph-{base,mon,osd}. When the latter packages are upgraded, they conflict with ceph-test, which was not being upgraded. Since it is no longer necessary to avoid upgrading ceph-test, and since b07aa210aa0ede54ffc3dbe49e334bd51a8f6342 tied ceph-test to the ceph-common of the exact same version, this bug could be fixed by removing ceph-test from the list of packages to be excluded from the upgrade. Fixes: https://tracker.ceph.com/issues/22558 Signed-off-by: Nathan Cutler --- .../kraken-client-x/basic/1-install/kraken-client-x.yaml | 2 +- .../kraken-client-x/rbd/1-install/kraken-client-x.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/basic/1-install/kraken-client-x.yaml b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/basic/1-install/kraken-client-x.yaml index 6cd29fd8c7bb9..48c4ae4a12391 100644 --- a/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/basic/1-install/kraken-client-x.yaml +++ b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/basic/1-install/kraken-client-x.yaml @@ -6,6 +6,6 @@ tasks: upgrade_workload: sequential: - install.upgrade: - exclude_packages: ['ceph-test', 'ceph-test-dbg','libcephfs1'] + exclude_packages: ['libcephfs1'] client.0: - print: "**** done install.upgrade to -x on client.0" diff --git a/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/rbd/1-install/kraken-client-x.yaml b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/rbd/1-install/kraken-client-x.yaml index 2ce1a17b79215..6bddaa07adcc5 100644 --- a/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/rbd/1-install/kraken-client-x.yaml +++ b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/rbd/1-install/kraken-client-x.yaml @@ -4,7 +4,7 @@ tasks: exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev'] - print: "**** done install jewel" - install.upgrade: - exclude_packages: ['ceph-test', 'ceph-test-dbg','libcephfs1'] + exclude_packages: ['libcephfs1'] client.1: - print: "**** done install.upgrade to -x on client.0" - ceph: -- 2.39.5