]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #32232 into master
authorSage Weil <sage@redhat.com>
Tue, 24 Dec 2019 14:17:35 +0000 (08:17 -0600)
committerSage Weil <sage@redhat.com>
Tue, 24 Dec 2019 14:17:35 +0000 (08:17 -0600)
* refs/pull/32232/head:
qa: no need to exclude ceph-mgr-diskprediction-cloud from package list to be installed
qa/packages: do not install ceph-mgr-diskprediction-cloud by default
ceph.spec.in: add runtime deps for mgr-diskprediction-cloud

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
ceph.spec.in
qa/packages/packages.yaml
qa/suites/rados/thrash-old-clients/1-install/hammer.yaml
qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml
qa/suites/rados/thrash-old-clients/1-install/jewel.yaml
qa/suites/rados/thrash-old-clients/1-install/luminous-v1only.yaml
qa/suites/rados/thrash-old-clients/1-install/luminous.yaml
qa/suites/rados/thrash-old-clients/1-install/mimic-v1only.yaml
qa/suites/rados/thrash-old-clients/1-install/mimic.yaml

diff --cc ceph.spec.in
Simple merge
index 9924532a6a6f55f824e675b505efa7f739542f84,d4a6037d15c76b96d2a6bc16aa9db81f95c472a3..99e2e43b6de4413ab6a7c89bd346e8254ab123a8
@@@ -38,12 -35,9 +38,11 @@@ ceph
    - ceph-radosgw
    - ceph-test
    - ceph
 +  - ceph-base
    - cephadm
 +  - ceph-immutable-object-cache
    - ceph-mgr
    - ceph-mgr-dashboard
-   - ceph-mgr-diskprediction-cloud
    - ceph-mgr-diskprediction-local
    - ceph-mgr-rook
    - ceph-mgr-cephadm