Skip to content

Commit d64fdaa

Browse files
committed
configured to work with copy_artifacts plugin
Instead of building Ceph, existing `build` would be copied from the job `ceph-pull-requests` (make-check) to save resources on building Ceph. Signed-off-by: Suyash Dongre <[email protected]>
1 parent 5e54b91 commit d64fdaa

File tree

2 files changed

+13
-25
lines changed

2 files changed

+13
-25
lines changed

ceph-pr-clang-tidy/build/build

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,26 @@ sudo apt-get install -y clang-tidy
1313

1414
sudo apt-get install -y parallel
1515

16-
build_debs ${VENV} ${vers} ${debian_version}
17-
1816
output_file="clang-tidy-result"
1917
file_list="files_to_check.txt"
2018

19+
# The file `ceph_build.tar.gz` is copied from the job `ceph-pull-request` using copy_artifacts
20+
tar -xzf ceph_build.tar.gz -C "$WORKSPACE"
21+
22+
rm ceph_build.tar.gz
23+
2124
# Store the list of files from both rgw and osd directories
22-
find "$WORKSPACE/src/rgw" \( -name '*.cpp' -o -name '*.hpp' -o -name '*.cc' \) > "$file_list"
23-
find "$WORKSPACE/src/osd" \( -name '*.cpp' -o -name '*.hpp' -o -name '*.cc' \) >> "$file_list"
25+
find "$WORKSPACE/ceph/src/rgw" \( -name '*.cpp' -o -name '*.hpp' -o -name '*.cc' \) > "$file_list"
26+
find "$WORKSPACE/ceph/src/osd" \( -name '*.cpp' -o -name '*.hpp' -o -name '*.cc' \) >> "$file_list"
2427

2528
# Run clang-tidy and save output
2629
{
2730
echo "Files being checked:"
2831
cat "$file_list"
2932
echo
30-
parallel -m clang-tidy -checks="-*,bugprone-use-after-move" -p "$WORKSPACE/build" {} < "$file_list"
31-
} | tee "$WORKSPACE/build/$output_file"
33+
parallel -m clang-tidy -checks="-*,bugprone-use-after-move" -p "$WORKSPACE/ceph/build" {} < "$file_list"
34+
} | tee "$WORKSPACE/ceph/build/$output_file"
3235

3336
sudo chmod +x clang-tidy-to-junit.py
3437

35-
clang-tidy-to-junit.py $WORKSPACE/src < "$WORKSPACE/build/$output_file" > "$WORKSPACE/report.xml"
38+
clang-tidy-to-junit.py $WORKSPACE/ceph/src < "$WORKSPACE/ceph/build/$output_file" > "$WORKSPACE/report.xml"

ceph-pr-clang-tidy/config/definitions/ceph-pr-clang-tidy.yml

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,37 +13,22 @@
1313
- build-discarder:
1414
days-to-keep: 15
1515
artifact-days-to-keep: 15
16-
- github:
17-
url: https://github.com/ceph/ceph/
18-
19-
scm:
20-
- git:
21-
url: https://github.com/ceph/ceph.git
22-
name: origin
23-
branches:
24-
- origin/pr/${ghprbPullId}/merge
25-
refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
26-
skip-tag: true
27-
shallow-clone: true
28-
honor-refspec: true
29-
timeout: 20
3016

3117
triggers:
3218
- github-pull-request:
3319
allow-whitelist-orgs-as-admins: true
3420
org-list:
3521
- ceph
36-
trigger-phrase: 'jenkins test clang-tidy'
3722
only-trigger-phrase: false
38-
github-hooks: true
39-
permit-all: true
40-
auto-close-on-fail: false
4123
status-context: "Clang-tidy lint check"
4224
started-status: "checking if bugs exist"
4325
success-status: "no bugs found"
4426
failure-status: "bugs found"
4527

4628
builders:
29+
- copyartifact:
30+
project: ceph-pull-requests
31+
4732
- shell:
4833
!include-raw:
4934
- ../../../scripts/build_utils.sh

0 commit comments

Comments
 (0)