qa: install ceph-classic-osd and ceph-crimson-osd

- qa/packages/packages.yaml: add ceph-osd and ceph-classic-osd to
  packages/packages.yaml, so that the "install" task can install
  ceph-classic-osd by default, this preserves the existing behavior.
- qa/suites/crimson-rados: install ceph-crimson-osd instead of
  ceph-classic-osd. adding them to exclude_packages and extra_packages
  to task.install allows us to customize the packages to be installed
  when performing the "install"
  task.
- qa/suites/crimson-rados-experimental: likewise.

Signed-off-by: Kefu Chai <k.chai@proxmox.com>

diff --git a/qa/config/crimson_install.yaml b/qa/config/crimson_install.yaml
new file mode 100644 (file)
index 0000000..2fd41f1
--- /dev/null
+++ b/qa/config/crimson_install.yaml
@@ -0,0 +1,16 @@
+tasks:
+- install:
+    exclude_packages:
+      deb:
+        - ceph-classic-osd
+        - ceph-classic-osd-dbg
+      rpm:
+        - ceph-classic-osd
+        - ceph-classic-osd-dbg
+    extra_packages:
+      deb:
+        - ceph-crimson-osd
+        - ceph-crimson-osd-dbg
+      rpm:
+        - ceph-crimson-osd
+        - ceph-crimson-osd-dbg

diff --git a/qa/packages/packages.yaml b/qa/packages/packages.yaml
index 866d59e6fa33e89a79b64be889e0ea6a6651ddd9..cb051a643775eabb43007134bc2b0ff4a853e24e 100644 (file)
--- a/qa/packages/packages.yaml
+++ b/qa/packages/packages.yaml
@@ -5,6 +5,8 @@ ceph:
   - cephadm
   - ceph-mds
   - ceph-mgr
+  - ceph-osd
+  - ceph-osd-classic
   - ceph-common
   - ceph-fuse
   - ceph-test
@@ -25,6 +27,7 @@ ceph:
   - ceph-mgr-dbg
   - ceph-mon-dbg
   - ceph-osd-dbg
+  - ceph-osd-classic-dbg
   - ceph-test-dbg
   - libcephfs2-dbg
   - librados2-dbg
@@ -47,6 +50,8 @@ ceph:
   - ceph-mgr-diskprediction-local
   - ceph-mgr-rook
   - ceph-mgr-cephadm
+  - ceph-osd
+  - ceph-classic-osd
   - ceph-fuse
   - ceph-volume
   - librados-devel
@@ -71,6 +76,7 @@ ceph:
   - ceph-mds-debuginfo
   - ceph-mon-debuginfo
   - ceph-osd-debuginfo
+  - ceph-classic-osd-debuginfo
   - ceph-fuse-debuginfo
   - librados-devel-debuginfo
   - libcephfs2-debuginfo

diff --git a/qa/suites/crimson-rados-experimental/thrash/crimson_install.yaml b/qa/suites/crimson-rados-experimental/thrash/crimson_install.yaml
new file mode 120000 (symlink)
index 0000000..e1c3e1b
--- /dev/null
+++ b/qa/suites/crimson-rados-experimental/thrash/crimson_install.yaml
@@ -0,0 +1 @@
+.qa/config/crimson_install.yaml
\ No newline at end of file

diff --git a/qa/suites/crimson-rados/basic/crimson_install.yaml b/qa/suites/crimson-rados/basic/crimson_install.yaml
new file mode 120000 (symlink)
index 0000000..e1c3e1b
--- /dev/null
+++ b/qa/suites/crimson-rados/basic/crimson_install.yaml
@@ -0,0 +1 @@
+.qa/config/crimson_install.yaml
\ No newline at end of file

diff --git a/qa/suites/crimson-rados/objectstore_tool/crimson_install.yaml b/qa/suites/crimson-rados/objectstore_tool/crimson_install.yaml
new file mode 120000 (symlink)
index 0000000..e1c3e1b
--- /dev/null
+++ b/qa/suites/crimson-rados/objectstore_tool/crimson_install.yaml
@@ -0,0 +1 @@
+.qa/config/crimson_install.yaml
\ No newline at end of file

diff --git a/qa/suites/crimson-rados/perf/crimson_install.yaml b/qa/suites/crimson-rados/perf/crimson_install.yaml
new file mode 120000 (symlink)
index 0000000..e1c3e1b
--- /dev/null
+++ b/qa/suites/crimson-rados/perf/crimson_install.yaml
@@ -0,0 +1 @@
+.qa/config/crimson_install.yaml
\ No newline at end of file

diff --git a/qa/suites/crimson-rados/rbd/crimson_install.yaml b/qa/suites/crimson-rados/rbd/crimson_install.yaml
new file mode 120000 (symlink)
index 0000000..e1c3e1b
--- /dev/null
+++ b/qa/suites/crimson-rados/rbd/crimson_install.yaml
@@ -0,0 +1 @@
+.qa/config/crimson_install.yaml
\ No newline at end of file

diff --git a/qa/suites/crimson-rados/singleton/crimson_install.yaml b/qa/suites/crimson-rados/singleton/crimson_install.yaml
new file mode 120000 (symlink)
index 0000000..e1c3e1b
--- /dev/null
+++ b/qa/suites/crimson-rados/singleton/crimson_install.yaml
@@ -0,0 +1 @@
+.qa/config/crimson_install.yaml
\ No newline at end of file

diff --git a/qa/suites/crimson-rados/thrash/crimson_install.yaml b/qa/suites/crimson-rados/thrash/crimson_install.yaml
new file mode 120000 (symlink)
index 0000000..e1c3e1b
--- /dev/null
+++ b/qa/suites/crimson-rados/thrash/crimson_install.yaml
@@ -0,0 +1 @@
+.qa/config/crimson_install.yaml
\ No newline at end of file

diff --git a/qa/suites/crimson-rados/thrash_seastore_radosbench/crimson_install.yaml b/qa/suites/crimson-rados/thrash_seastore_radosbench/crimson_install.yaml
new file mode 120000 (symlink)
index 0000000..e1c3e1b
--- /dev/null
+++ b/qa/suites/crimson-rados/thrash_seastore_radosbench/crimson_install.yaml
@@ -0,0 +1 @@
+.qa/config/crimson_install.yaml
\ No newline at end of file

diff --git a/qa/suites/crimson-rados/thrash_simple/crimson_install.yaml b/qa/suites/crimson-rados/thrash_simple/crimson_install.yaml
new file mode 120000 (symlink)
index 0000000..e1c3e1b
--- /dev/null
+++ b/qa/suites/crimson-rados/thrash_simple/crimson_install.yaml
@@ -0,0 +1 @@
+.qa/config/crimson_install.yaml
\ No newline at end of file