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 <kchai@redhat.com>
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)

diff --git a/qa/packages/packages.yaml b/qa/packages/packages.yaml
index 31fb66aa949e505a5c97f0d863754abf8aa64b49..8140ef372c7a71b89a1646d3e4257f0f8ce4a12b 100644 (file)
--- 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 0471509b2a6733220d8fa65b43622bb592dd1c82..16d9c81b6aa4e114e0ae8704bd4b07108bfe646c 100644 (file)
--- 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 87bebb4452ce9080e5eeb0167da06601f8733147..b8f748ff158325209acf554f66b132eec94a073c 100644 (file)
--- 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