From 4cfa8c7c5508d31e3c3c2e262a5ce97b907115f1 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 11 Jun 2019 23:17:46 +0800 Subject: [PATCH] qa: install python3-{cephfs,rados} instead of python34-* we install the latest python-rpm-macros on all builders since https://github.com/ceph/ceph-build/pull/1283 . now that we started building python36-* after that change, for testing the python3 packages on CentOS/RHEL 7, we need to install python36-* instead of python34-*. and after the change of 8ae1947, python36-* now "Provides" python3-*, we can just install python3-* for fulfill the requirement for testing python3 cephfs bindings. Fixes: http://tracker.ceph.com/issues/39164 Signed-off-by: Kefu Chai Conflicts: this change is not cherry-picked from master, because, in master, we don't install python3 packages after 7e5c85b604. (cherry picked from commit 6790821afc749b14b1ddac68a0889059419eebb3) --- qa/packages/packages.yaml | 4 ++-- qa/suites/upgrade/jewel-x/parallel/1-jewel-install/jewel.yaml | 2 +- .../upgrade/jewel-x/stress-split/1-jewel-install/jewel.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qa/packages/packages.yaml b/qa/packages/packages.yaml index 31fb66aa949e5..8140ef372c7a7 100644 --- a/qa/packages/packages.yaml +++ b/qa/packages/packages.yaml @@ -45,5 +45,5 @@ ceph: - python-ceph - rbd-fuse - ceph-debuginfo - - python34-cephfs - - python34-rados + - python3-cephfs + - python3-rados diff --git a/qa/suites/upgrade/jewel-x/parallel/1-jewel-install/jewel.yaml b/qa/suites/upgrade/jewel-x/parallel/1-jewel-install/jewel.yaml index 0471509b2a673..16d9c81b6aa4e 100644 --- a/qa/suites/upgrade/jewel-x/parallel/1-jewel-install/jewel.yaml +++ b/qa/suites/upgrade/jewel-x/parallel/1-jewel-install/jewel.yaml @@ -25,7 +25,7 @@ meta: tasks: - install: branch: jewel - exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev','python34-cephfs','python34-rados','python34-rbd','python34-rgw','python34-ceph-argparse','python3-cephfs','python3-rados'] + exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev','python36-cephfs','python36-rados','python36-rbd','python36-rgw','python36-ceph-argparse','python3-cephfs','python3-rados'] - print: "**** done installing jewel" - ceph: skip_mgr_daemons: true diff --git a/qa/suites/upgrade/jewel-x/stress-split/1-jewel-install/jewel.yaml b/qa/suites/upgrade/jewel-x/stress-split/1-jewel-install/jewel.yaml index 87bebb4452ce9..b8f748ff15832 100644 --- a/qa/suites/upgrade/jewel-x/stress-split/1-jewel-install/jewel.yaml +++ b/qa/suites/upgrade/jewel-x/stress-split/1-jewel-install/jewel.yaml @@ -3,7 +3,7 @@ meta: tasks: - install: branch: jewel - exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev','python34-cephfs','python34-rados','python34-rbd','python34-rgw','python34-ceph-argparse','python3-cephfs','python3-rados'] + exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev','python36-cephfs','python36-rados','python36-rbd','python36-rgw','python36-ceph-argparse','python3-cephfs','python3-rados'] - print: "**** done install jewel" - ceph: skip_mgr_daemons: true -- 2.39.5