]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-build.git/commitdiff
ceph-perf-pull-requests: conditionalize run-cbt
authorKefu Chai <kchai@redhat.com>
Tue, 14 Apr 2020 04:34:49 +0000 (12:34 +0800)
committerKefu Chai <kchai@redhat.com>
Tue, 14 Apr 2020 05:22:44 +0000 (13:22 +0800)
to guard the embedded shell script with the check of "osd-flavor" parameter

Signed-off-by: Kefu Chai <kchai@redhat.com>
ceph-perf-pull-requests/config/definitions/ceph-perf-pull-requests.yml

index d8bc5d486afbfd4d312df0a5318d4ecdd66e7438..0fad6d13e763c945e718b258fa24012d8d6f5e39 100644 (file)
       - 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: