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
Merge "Add Docker Verify and Merge jobs"
[releng/global-jjb.git]
/
jjb
/
lf-maven-jobs.yaml
diff --git
a/jjb/lf-maven-jobs.yaml
b/jjb/lf-maven-jobs.yaml
index
2e35245
..
abbf66e
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'
@@
-160,7
+161,7
@@
gerrit_clm_triggers:
- comment-added-contains-event:
gerrit_clm_triggers:
- comment-added-contains-event:
- comment-contains-value:
run-clm$
+ comment-contains-value:
'^Patch Set\s+\d+:\s+run-clm\s*$'
parameters:
- lf-infra-parameters:
parameters:
- lf-infra-parameters:
@@
-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,11
+307,12
@@
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
- comment-added-contains-event:
gerrit_merge_triggers:
- change-merged-event
- comment-added-contains-event:
- comment-contains-value:
remerge$
+ comment-contains-value:
'^Patch Set\s+\d+:\s+remerge\s*$'
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-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:
@@
-438,7
+445,7
@@
exclude-no-code-change: false
- draft-published-event
- comment-added-contains-event:
exclude-no-code-change: false
- draft-published-event
- comment-added-contains-event:
- comment-contains-value: '^Patch Set
[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)
$'
+ comment-contains-value: '^Patch Set
\s+\d+:\s+(recheck|reverify)\s*
$'
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-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,11
+559,12
@@
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
- comment-added-contains-event:
gerrit_merge_triggers:
- change-merged-event
- comment-added-contains-event:
- comment-contains-value:
remerge$
+ comment-contains-value:
'^Patch Set\s+\d+:\s+remerge\s*$'
gerrit_trigger_file_paths:
- compare-type: REG_EXP
gerrit_trigger_file_paths:
- compare-type: REG_EXP
@@
-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,10
+828,19
@@
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:
gerrit_release_triggers:
- comment-added-contains-event:
- comment-contains-value: stage-release$
+ comment-contains-value: '^Patch Set\s+\d+:\s+stage-release\s*$'
+
+ 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 #
@@
-965,12
+992,12
@@
- lf-provide-maven-settings:
global-settings-file: '{mvn-global-settings}'
settings-file: '{mvn-settings}'
- lf-provide-maven-settings:
global-settings-file: '{mvn-global-settings}'
settings-file: '{mvn-settings}'
- - shell: !include-raw-escape: ../shell/maven-patch-release.sh
- lf-maven-versions-plugin:
maven-versions-plugin: '{maven-versions-plugin}'
mvn-version: '{mvn-version}'
mvn-pom: '{mvn-pom}'
mvn-settings: '{mvn-settings}'
- lf-maven-versions-plugin:
maven-versions-plugin: '{maven-versions-plugin}'
mvn-version: '{mvn-version}'
mvn-pom: '{mvn-pom}'
mvn-settings: '{mvn-settings}'
+ - shell: !include-raw-escape: ../shell/maven-patch-release.sh
- inject:
properties-content: |
CONTAINER_PULL_REGISTRY={container-public-registry}
- inject:
properties-content: |
CONTAINER_PULL_REGISTRY={container-public-registry}
@@
-1002,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:
@@
-1015,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}'
@@
-1038,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}'
@@
-1051,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 #
@@
-1083,10
+1114,11
@@
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:
- comment-contains-value:
run-sonar$
+ comment-contains-value:
'^Patch Set\s+\d+:\s+run-sonar\s*$'
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-1222,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:
@@
-1244,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}'
@@
-1288,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:
@@
-1296,7
+1331,7
@@
exclude-no-code-change: false
- draft-published-event
- comment-added-contains-event:
exclude-no-code-change: false
- draft-published-event
- comment-added-contains-event:
- comment-contains-value: '^Patch Set
[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)
$'
+ comment-contains-value: '^Patch Set
\s+\d+:\s+(recheck|reverify)\s*
$'
gerrit_trigger_file_paths:
- compare-type: REG_EXP
gerrit_trigger_file_paths:
- compare-type: REG_EXP
@@
-1347,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:
@@
-1381,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}'
@@
-1388,7
+1425,7
@@
- github-pull-request:
trigger-phrase: '^(recheck|reverify)$'
only-trigger-phrase: false
- github-pull-request:
trigger-phrase: '^(recheck|reverify)$'
only-trigger-phrase: false
- status-context: 'Maven Verify'
+ status-context: 'Maven Verify
{mvn-version}-{java-version}
'
permit-all: true
github-hooks: true
white-list-target-branches:
permit-all: true
github-hooks: true
white-list-target-branches:
@@
-1443,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:
@@
-1479,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}'
@@
-1486,7
+1525,7
@@
- github-pull-request:
trigger-phrase: '^(recheck|reverify)$'
only-trigger-phrase: false
- github-pull-request:
trigger-phrase: '^(recheck|reverify)$'
only-trigger-phrase: false
- status-context: 'Maven Docker Verify'
+ status-context: 'Maven Docker Verify
{mvn-version}-{java-version}
'
permit-all: true
github-hooks: true
white-list-target-branches:
permit-all: true
github-hooks: true
white-list-target-branches:
@@
-1519,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:
@@
-1572,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: