Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Patch new Cmake/Tox + SonarQube templates
[releng/global-jjb.git]
/
jjb
/
lf-c-cpp-jobs.yaml
diff --git
a/jjb/lf-c-cpp-jobs.yaml
b/jjb/lf-c-cpp-jobs.yaml
index
fa4e35b
..
6f4db49
100644
(file)
--- a/
jjb/lf-c-cpp-jobs.yaml
+++ b/
jjb/lf-c-cpp-jobs.yaml
@@
-159,6
+159,7
@@
github-url: "https://github.com"
install-prefix: "$BUILD_DIR/output"
make-opts: ""
github-url: "https://github.com"
install-prefix: "$BUILD_DIR/output"
make-opts: ""
+ pre-build: ""
stream: master
submodule-recursive: true
submodule-timeout: 10
stream: master
submodule-recursive: true
submodule-timeout: 10
@@
-167,7
+168,6
@@
# Sonar properties
sonar-additional-args: ""
sonar-java-opts: ""
# Sonar properties
sonar-additional-args: ""
sonar-java-opts: ""
- sonar-prescan-script: ""
sonar-project-file: "sonar-project.properties"
sonar-properties: ""
sonar-task: ""
sonar-project-file: "sonar-project.properties"
sonar-properties: ""
sonar-task: ""
@@
-210,7
+210,7
@@
builders:
- lf-infra-pre-build
builders:
- lf-infra-pre-build
- - shell: "{
sonar-prescan-script
}"
+ - shell: "{
pre-build
}"
- shell: !include-raw-escape: ../shell/cmake-sonarqube.sh
- lf-infra-sonar:
sonar-task: "{sonar-task}"
- shell: !include-raw-escape: ../shell/cmake-sonarqube.sh
- lf-infra-sonar:
sonar-task: "{sonar-task}"
@@
-228,6
+228,14
@@
concurrent: false
<<: *lf_cmake_sonarqube
concurrent: false
<<: *lf_cmake_sonarqube
+ ######################
+ # Default parameters #
+ ######################
+
+ gerrit_sonar_triggers:
+ - comment-added-contains-event:
+ comment-contains-value: '^Patch Set\s+\d+:\s+run-sonar\s*$'
+
scm:
- lf-infra-gerrit-scm:
branch: "$GERRIT_BRANCH"
scm:
- lf-infra-gerrit-scm:
branch: "$GERRIT_BRANCH"
@@
-243,9
+251,7
@@
- timed: "{obj:cron}"
- gerrit:
server-name: "{gerrit-server-name}"
- timed: "{obj:cron}"
- gerrit:
server-name: "{gerrit-server-name}"
- trigger-on:
- - comment-added-contains-event:
- comment-contains-value: '^Patch Set\s+\d+:\s+run-sonar\s*$'
+ trigger-on: "{obj:gerrit_sonar_triggers}"
projects:
- project-compare-type: "ANT"
project-pattern: "{project}"
projects:
- project-compare-type: "ANT"
project-pattern: "{project}"