From: Kefu Chai <kchai@redhat.com>
Date: Tue, 14 Apr 2020 04:34:49 +0000 (+0800)
Subject: ceph-perf-pull-requests: conditionalize run-cbt
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bffbb0e937cdf222c5668950229ce43fc494591a;p=ceph-build.git

ceph-perf-pull-requests: conditionalize run-cbt

to guard the embedded shell script with the check of "osd-flavor" parameter

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/ceph-perf-pull-requests/config/definitions/ceph-perf-pull-requests.yml b/ceph-perf-pull-requests/config/definitions/ceph-perf-pull-requests.yml
index d8bc5d48..0fad6d13 100644
--- a/ceph-perf-pull-requests/config/definitions/ceph-perf-pull-requests.yml
+++ b/ceph-perf-pull-requests/config/definitions/ceph-perf-pull-requests.yml
@@ -51,13 +51,17 @@
       - shell: |
           cd {src_dir}
           archive_dir={archive_basedir}/$(git rev-parse --short HEAD)
-          if ! test -d $archive_dir ; then
-              export NPROC=$(nproc)
-              export FOR_MAKE_CHECK=true
+          if test -d $archive_dir ; then
+              exit 0
+          fi
+          export NPROC=$(nproc)
+          export FOR_MAKE_CHECK=true
+          if test {osd-flavor} = "crimson" ; then
               export WITH_SEASTAR=true
               timeout 7200 src/script/run-make.sh --cmake-args "-DCMAKE_BUILD_TYPE=Release -DWITH_SEASTAR=ON -DWITH_TESTS=OFF" vstart-base crimson-osd
               src/script/run-cbt.sh --build-dir $PWD/build --source-dir $PWD --cbt ${{WORKSPACE}}/cbt -a $archive_dir src/test/crimson/cbt/radosbench_4K_read.yaml
           fi
+
 - builder:
     name: compare-cbt-results
     builders: