Merge pull request ceph#66229 from Matan-B/wip-matanb-crimson-on

ceph.spec.in: Include Crimson by default

Reviewed-by: Casey Bodley <[email protected]>

Author: Matan-B

ceph.spec.in

@@ -91,7 +91,7 @@
 %bcond_with lua_packages
 %endif
 %endif
-%bcond_with crimson
+%bcond_without crimson
 %if 0%{?suse_version} || 0%{?openEuler}
 %bcond_with jaeger
 %else
@@ -912,7 +912,10 @@ Summary:	Ceph Object Storage Daemon
 Group:		System/Filesystems
 %endif
 Requires:	ceph-base = %{_epoch_prefix}%{version}-%{release}
-Requires:	(ceph-osd-classic = %{_epoch_prefix}%{version}-%{release} or ceph-osd-crimson = %{_epoch_prefix}%{version}-%{release})
+Requires:	ceph-osd-classic = %{_epoch_prefix}%{version}-%{release}
+%if 0%{with crimson}
+Requires: 	ceph-osd-crimson = %{_epoch_prefix}%{version}-%{release}
+%endif
 Requires:	sudo
 Requires:	libstoragemgmt
 %if 0%{?weak_deps}

container/Containerfile

@@ -150,11 +150,6 @@ libradosstriper1 \
 rbd-mirror" \
 >> packages.txt
 
-# Optional crimson package(s)
-RUN if [[ "${OSD_FLAVOR}" == "crimson-debug" || "${OSD_FLAVOR}" == "crimson-release" ]]; then \
-    echo "ceph-osd-crimson" >> packages.txt ; \
-fi
-
 # Ceph "Recommends"
 RUN echo "nvme-cli python3-saml smartmontools" >> packages.txt
 # NFS-Ganesha

debian/control

@@ -416,7 +416,8 @@ Description: debugging symbols for ceph-mon
 
 Package: ceph-osd
 Architecture: linux-any
-Depends: ceph-osd-classic (= ${binary:Version}) | ceph-osd-crimson (= ${binary:Version}),
+Depends: ceph-osd-classic (= ${binary:Version}),
+         ceph-osd-crimson (= ${binary:Version}) <pkg.ceph.crimson>,
          sudo,
          ${python3:Depends},
          ${misc:Depends},

qa/config/crimson_qa_overrides.yaml

@@ -12,6 +12,7 @@ overrides:
         debug ms: 20
         seastore cachepin size pershard: 64M
         seastore max concurrent transactions: 8
+    crimson_compat: true
   workunit:
     env:
       CRIMSON_COMPAT: '1'

qa/crontab/teuthology-cronjobs

@@ -72,7 +72,7 @@ TEUTHOLOGY_SUITE_ARGS="--non-interactive --newest=100 --ceph-repo=https://git.ce
 40 20 * * 5        $CW $SS      1 --ceph main --suite        rgw -p 150 --subset "$(($RANDOM % 30000))/30000"
 48 20 * * 6        $CW $SS      4 --ceph main --suite       krbd -p 950 --kernel testing
 56 20 * * 2,6      $CW $SS      1 --ceph main --suite crimson-rados -p 101 --force-priority --flavor crimson-debug
-04 21 * * 2,6      $CW $SS      1 --ceph main --suite crimson-rados -p 101 --force-priority --flavor crimson-release
+04 21 * * 2,6      $CW $SS      1 --ceph main --suite crimson-rados -p 101 --force-priority
 
 ## tentacle branch runs - weekly
 # rados is massive and difficult to bring down to less than 300 jobs, use one higher priority

qa/suites/rados/thrash-old-clients/1-install/reef.yaml

@@ -11,6 +11,7 @@ tasks:
       - ceph-mgr-rook
       - ceph-mgr-cephadm
       - ceph-osd-classic
+      - ceph-osd-crimson
       - ceph-base-debuginfo
       - ceph-common-debuginfo
       - ceph-immutable-object-cache-debuginfo

qa/suites/rados/thrash-old-clients/1-install/squid.yaml

@@ -11,6 +11,7 @@ tasks:
       - ceph-mgr-rook
       - ceph-mgr-cephadm
       - ceph-osd-classic
+      - ceph-osd-crimson
       - ceph-base-debuginfo
       - ceph-common-debuginfo
       - ceph-immutable-object-cache-debuginfo

qa/suites/rados/thrash-old-clients/1-install/tentacle.yaml

@@ -11,6 +11,7 @@ tasks:
       - ceph-mgr-rook
       - ceph-mgr-cephadm
       - ceph-osd-classic
+      - ceph-osd-crimson
       - ceph-base-debuginfo
       - ceph-common-debuginfo
       - ceph-immutable-object-cache-debuginfo

qa/suites/upgrade/reef-x/parallel/1-tasks.yaml

@@ -9,6 +9,7 @@ tasks:
     exclude_packages:
       - ceph-osd-classic
       - ceph-volume
+      - ceph-osd-crimson
 - print: "**** done install task..."
 - print: "**** done start installing reef cephadm ..."
 - cephadm:

qa/suites/upgrade/squid-x/parallel/1-tasks.yaml

@@ -9,6 +9,7 @@ tasks:
     exclude_packages:
       - ceph-osd-classic
       - ceph-volume
+      - ceph-osd-crimson
 - print: "**** done install task..."
 - print: "**** done start installing squid cephadm ..."
 - cephadm: