From: Neha Ojha <nojha@redhat.com>
Date: Fri, 24 Apr 2020 18:01:17 +0000 (+0000)
Subject: qa/suites/rados/thrash-old-clients/1-install: remove jewel
X-Git-Tag: v16.1.0~2490^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5ac2f54701ab1c46ff3ad020b6f9c3477acfd7df;p=ceph.git

qa/suites/rados/thrash-old-clients/1-install: remove jewel

Since we've changed mon_osd_initial_require_min_compat_client to
luminous in 986c271b756a6b3f472ec6848fc0d6680c45cf5b, we can remove jewel from
mix.

Fixes: https://tracker.ceph.com/issues/45242
Signed-off-by: Neha Ojha <nojha@redhat.com>
---

diff --git a/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml b/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml
deleted file mode 100644
index 5c5fdc0b2c5..00000000000
--- a/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-overrides:
-  ceph:
-    mon_bind_msgr2: false
-    log-whitelist:
-      - \(MON_DOWN\)
-    conf:
-      global:
-        ms type: async
-        ms bind msgr2: false
-tasks:
-- install:
-    branch: jewel
-    exclude_packages:
-      - librados3
-      - ceph-mgr-dashboard
-      - ceph-mgr-diskprediction-local
-      - ceph-mgr-rook
-      - ceph-mgr-cephadm
-      - cephadm
-      - ceph-mgr
-      - libcephfs2
-      - libcephfs-devel
-      - libcephfs-dev
-      - ceph-immutable-object-cache
-      - ceph-base
-      - librados-devel
-      - python3-rados
-      - python3-rgw
-      - python3-rbd
-      - python3-cephfs
-    extra_packages:
-      - librados2
-      - python-rados
-      - python-rbd
-      - python-cephfs
diff --git a/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml b/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml
deleted file mode 100644
index fea79d4a70b..00000000000
--- a/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-overrides:
-  ceph:
-    mon_bind_msgr2: false
-    log-whitelist:
-      - \(MON_DOWN\)
-    conf:
-      global:
-        mon warn on msgr2 not enabled: false
-tasks:
-- install:
-    branch: jewel
-    exclude_packages:
-      - librados3
-      - ceph-mgr-dashboard
-      - ceph-mgr-diskprediction-local
-      - ceph-mgr-rook
-      - ceph-mgr-cephadm
-      - cephadm
-      - ceph-mgr
-      - libcephfs2
-      - libcephfs-devel
-      - libcephfs-dev
-      - ceph-immutable-object-cache
-      - ceph-base
-      - librados-devel
-      - python3-rados
-      - python3-rgw
-      - python3-rbd
-      - python3-cephfs
-    extra_packages:
-      - librados2
-      - python-rados
-      - python-rbd
-      - python-cephfs