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
Handle multiple search extension passed by JJB
[releng/global-jjb.git]
/
jjb
/
lf-maven-jobs.yaml
diff --git
a/jjb/lf-maven-jobs.yaml
b/jjb/lf-maven-jobs.yaml
index
0ea9e67
..
98bc714
100644
(file)
--- a/
jjb/lf-maven-jobs.yaml
+++ b/
jjb/lf-maven-jobs.yaml
@@
-150,6
+150,7
@@
stream: master
submodule-recursive: true
submodule-timeout: 10
stream: master
submodule-recursive: true
submodule-timeout: 10
+ submodule-disable: false
nexus_iq_scan_patterns:
- '**/*.ear'
nexus_iq_scan_patterns:
- '**/*.ear'
@@
-220,6
+221,7
@@
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
triggers:
choosing-strategy: default
triggers:
@@
-260,6
+262,7
@@
branch: 'refs/heads/{branch}'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: 'refs/heads/{branch}'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-304,6
+307,7
@@
stream: master
submodule-recursive: true
submodule-timeout: 10
stream: master
submodule-recursive: true
submodule-timeout: 10
+ submodule-disable: false
gerrit_merge_triggers:
- change-merged-event
gerrit_merge_triggers:
- change-merged-event
@@
-351,6
+355,7
@@
branch: '{branch}'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: '{branch}'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-385,6
+390,7
@@
branch: '{branch}'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: '{branch}'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-430,6
+436,7
@@
stream: master
submodule-recursive: true
submodule-timeout: 10
stream: master
submodule-recursive: true
submodule-timeout: 10
+ submodule-disable: false
gerrit_verify_triggers:
- patchset-created-event:
gerrit_verify_triggers:
- patchset-created-event:
@@
-476,6
+483,7
@@
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: gerrit
triggers:
choosing-strategy: gerrit
triggers:
@@
-509,6
+517,7
@@
branch: '$sha1'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: '$sha1'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-550,6
+559,7
@@
stream: master
submodule-recursive: true
submodule-timeout: 10
stream: master
submodule-recursive: true
submodule-timeout: 10
+ submodule-disable: false
gerrit_merge_triggers:
- change-merged-event
gerrit_merge_triggers:
- change-merged-event
@@
-615,6
+625,7
@@
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
triggers:
choosing-strategy: default
triggers:
@@
-650,6
+661,7
@@
branch: 'refs/heads/{branch}'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: 'refs/heads/{branch}'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-724,6
+736,7
@@
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
triggers:
choosing-strategy: default
triggers:
@@
-760,6
+773,7
@@
branch: 'refs/heads/{branch}'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: 'refs/heads/{branch}'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-814,11
+828,20
@@
stream: master
submodule-recursive: true
submodule-timeout: 10
stream: master
submodule-recursive: true
submodule-timeout: 10
+ submodule-disable: false
gerrit_release_triggers:
- comment-added-contains-event:
comment-contains-value: stage-release$
gerrit_release_triggers:
- comment-added-contains-event:
comment-contains-value: stage-release$
+ gerrit_trigger_file_paths:
+ - compare-type: ANT
+ pattern: '**'
+
+ # github_included_regions MUST match gerrit_trigger_file_paths
+ github_included_regions:
+ - '.*'
+
#####################
# Job Configuration #
#####################
#####################
# Job Configuration #
#####################
@@
-896,6
+919,7
@@
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
triggers:
choosing-strategy: default
triggers:
@@
-909,6
+933,7
@@
branches:
- branch-compare-type: ANT
branch-pattern: '**/{branch}'
branches:
- branch-compare-type: ANT
branch-pattern: '**/{branch}'
+ file-paths: '{obj:gerrit_trigger_file_paths}'
- job-template:
name: '{project-name}-maven-stage-{stream}'
- job-template:
name: '{project-name}-maven-stage-{stream}'
@@
-930,6
+955,7
@@
branch: '{branch}'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: '{branch}'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-943,6
+969,7
@@
github-hooks: true
white-list-target-branches:
- '{branch}'
github-hooks: true
white-list-target-branches:
- '{branch}'
+ included-regions: '{obj:github_included_regions}'
##########################
# Maven Stage for Docker #
##########################
# Maven Stage for Docker #
@@
-970,7
+997,6
@@
maven-versions-plugin: '{maven-versions-plugin}'
mvn-version: '{mvn-version}'
mvn-pom: '{mvn-pom}'
maven-versions-plugin: '{maven-versions-plugin}'
mvn-version: '{mvn-version}'
mvn-pom: '{mvn-pom}'
- maven-versions-plugin-set-version: '{maven-versions-plugin-set-version}'
mvn-settings: '{mvn-settings}'
- inject:
properties-content: |
mvn-settings: '{mvn-settings}'
- inject:
properties-content: |
@@
-1003,6
+1029,7
@@
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
triggers:
choosing-strategy: default
triggers:
@@
-1016,6
+1043,7
@@
branches:
- branch-compare-type: ANT
branch-pattern: '**/{branch}'
branches:
- branch-compare-type: ANT
branch-pattern: '**/{branch}'
+ file-paths: '{obj:gerrit_trigger_file_paths}'
- job-template:
name: '{project-name}-maven-docker-stage-{stream}'
- job-template:
name: '{project-name}-maven-docker-stage-{stream}'
@@
-1039,6
+1067,7
@@
branch: '{branch}'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: '{branch}'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-1052,6
+1081,7
@@
github-hooks: true
white-list-target-branches:
- '{branch}'
github-hooks: true
white-list-target-branches:
- '{branch}'
+ included-regions: '{obj:github_included_regions}'
###############
# Maven Sonar #
###############
# Maven Sonar #
@@
-1084,6
+1114,7
@@
stream: master
submodule-recursive: true
submodule-timeout: 10
stream: master
submodule-recursive: true
submodule-timeout: 10
+ submodule-disable: false
gerrit_sonar_triggers:
- comment-added-contains-event:
gerrit_sonar_triggers:
- comment-added-contains-event:
@@
-1223,6
+1254,7
@@
branch: $GERRIT_BRANCH
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: $GERRIT_BRANCH
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
- job-template:
choosing-strategy: default
- job-template:
@@
-1245,6
+1277,7
@@
branch: '$sha1'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: '$sha1'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-1289,6
+1322,7
@@
stream: master
submodule-recursive: true
submodule-timeout: 10
stream: master
submodule-recursive: true
submodule-timeout: 10
+ submodule-disable: false
gerrit_verify_triggers:
- patchset-created-event:
gerrit_verify_triggers:
- patchset-created-event:
@@
-1348,6
+1382,7
@@
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: gerrit
triggers:
choosing-strategy: gerrit
triggers:
@@
-1382,6
+1417,7
@@
branch: '$sha1'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: '$sha1'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-1403,6
+1439,9
@@
- lf_maven_docker_verify: &lf_maven_docker_verify
name: lf-maven-docker-verify
- lf_maven_docker_verify: &lf_maven_docker_verify
name: lf-maven-docker-verify
+ # image push not allowed during verification
+ mvn-goals: clean install
+
builders:
- lf-infra-pre-build
- lf-jacoco-nojava-workaround
builders:
- lf-infra-pre-build
- lf-jacoco-nojava-workaround
@@
-1441,6
+1480,7
@@
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: gerrit
triggers:
choosing-strategy: gerrit
triggers:
@@
-1477,6
+1517,7
@@
branch: '$sha1'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: '$sha1'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-1517,6
+1558,7
@@
stream: master
submodule-recursive: true
submodule-timeout: 10
stream: master
submodule-recursive: true
submodule-timeout: 10
+ submodule-disable: false
gerrit_verify_triggers:
- comment-added-contains-event:
gerrit_verify_triggers:
- comment-added-contains-event:
@@
-1570,6
+1612,7
@@
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: gerrit
triggers:
choosing-strategy: gerrit
triggers: