Skip to content

Commit 3afd0fb

Browse files
committed
ceph-pull-requests: omit run-rbd-unit-tests unless pr matches @ceph/rbd codeowner
ceph-pull-requests and ceph-pull-requests-arm64 use pr_matches_codeowner() to check for @ceph/rbd ownership. if there is no match, use the CHECK_MAKEOPTS environment variable to pass an additional '-E run-rbd-unit-tests' argument to ctest this causes ctest to exclude the following long-running tests: > run-rbd-unit-tests-N.sh > run-rbd-unit-tests-0.sh > run-rbd-unit-tests-1.sh > run-rbd-unit-tests-61.sh > run-rbd-unit-tests-109.sh > run-rbd-unit-tests-127.sh Fixes: https://tracker.ceph.com/issues/70993 Signed-off-by: Casey Bodley <cbodley@redhat.com>
1 parent 6d2f944 commit 3afd0fb

File tree

2 files changed

+8
-0
lines changed
  • ceph-pull-requests-arm64/build
  • ceph-pull-requests/build

2 files changed

+8
-0
lines changed

ceph-pull-requests-arm64/build/build

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ export CHECK_MAKEOPTS="-j${n_test_jobs}"
1313
export BUILD_MAKEOPTS="-j${n_build_jobs}"
1414
export WITH_CRIMSON=true
1515
export WITH_RBD_RWL=true
16+
# exclude run-rbd-unit-tests* for non-rbd pull requests
17+
if ! pr_matches_codeowner "@ceph/rbd"; then
18+
CHECK_MAKEOPTS+=" -E run-rbd-unit-tests"
19+
fi
1620
timeout 4h ./run-make-check.sh
1721
sleep 5
1822
ps -ef | grep -v jnlp | grep ceph || true

ceph-pull-requests/build/build

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ fi
1010
export NPROC=$(nproc)
1111
export WITH_CRIMSON=true
1212
export WITH_RBD_RWL=true
13+
# exclude run-rbd-unit-tests* for non-rbd pull requests
14+
if ! pr_matches_codeowner "@ceph/rbd"; then
15+
export CHECK_MAKEOPTS="-E run-rbd-unit-tests"
16+
fi
1317
timeout 3h ./run-make-check.sh
1418
sleep 5
1519
ps -ef | grep -v jnlp | grep ceph || true

0 commit comments

Comments
 (0)