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 stack removal with the force option
[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
..
e42dcde
100644
(file)
--- a/
jjb/lf-maven-jobs.yaml
+++ b/
jjb/lf-maven-jobs.yaml
@@
-29,7
+29,7
@@
condition-expression: '{maven-versions-plugin}'
steps:
- inject:
condition-expression: '{maven-versions-plugin}'
steps:
- inject:
- properties-file:
version.properties
+ properties-file:
'{version-properties-file}'
- maven-target:
maven-version: '{mvn-version}'
pom: '{mvn-pom}'
- maven-target:
maven-version: '{mvn-version}'
pom: '{mvn-pom}'
@@
-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}'
@@
-801,6
+815,7
@@
github-url: 'https://github.com'
java-version: openjdk8
maven-versions-plugin: false
github-url: 'https://github.com'
java-version: openjdk8
maven-versions-plugin: false
+ version-properties-file: version.properties
mvn-central: false
mvn-global-settings: global-settings
mvn-goals: clean deploy
mvn-central: false
mvn-global-settings: global-settings
mvn-goals: clean deploy
@@
-814,10
+829,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 #
@@
-860,6
+884,7
@@
settings-file: '{mvn-settings}'
- lf-maven-versions-plugin:
maven-versions-plugin: '{maven-versions-plugin}'
settings-file: '{mvn-settings}'
- lf-maven-versions-plugin:
maven-versions-plugin: '{maven-versions-plugin}'
+ version-properties-file: '{version-properties-file}'
mvn-version: '{mvn-version}'
mvn-pom: '{mvn-pom}'
mvn-settings: '{mvn-settings}'
mvn-version: '{mvn-version}'
mvn-pom: '{mvn-pom}'
mvn-settings: '{mvn-settings}'
@@
-896,6
+921,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
+935,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
+957,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
+971,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,13
+994,13
@@
- 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}'
- lf-maven-versions-plugin:
maven-versions-plugin: '{maven-versions-plugin}'
+ version-properties-file: '{version-properties-file}'
mvn-version: '{mvn-version}'
mvn-pom: '{mvn-pom}'
mvn-version: '{mvn-version}'
mvn-pom: '{mvn-pom}'
- maven-versions-plugin-set-version: '{maven-versions-plugin-set-version}'
mvn-settings: '{mvn-settings}'
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}
@@
-1003,6
+1032,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
+1046,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
+1070,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
+1084,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 #
@@
-1073,6
+1106,7
@@
github-url: 'https://github.com'
java-version: openjdk8
mvn-global-settings: global-settings
github-url: 'https://github.com'
java-version: openjdk8
mvn-global-settings: global-settings
+ mvn-goals: clean install
mvn-opts: ''
mvn-params: ''
mvn-version: mvn35
mvn-opts: ''
mvn-params: ''
mvn-version: mvn35
@@
-1084,10
+1118,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 #
@@
-1143,6
+1178,7
@@
- shell: echo 'Using SonarCloud'
- lf-infra-maven-sonarcloud:
java-version: '{java-version}'
- shell: echo 'Using SonarCloud'
- lf-infra-maven-sonarcloud:
java-version: '{java-version}'
+ mvn-goals: '{mvn-goals}'
mvn-settings: '{mvn-settings}'
mvn-version: '{mvn-version}'
sonarcloud-project-key: '{sonarcloud-project-key}'
mvn-settings: '{mvn-settings}'
mvn-version: '{mvn-version}'
sonarcloud-project-key: '{sonarcloud-project-key}'
@@
-1158,6
+1194,7
@@
- shell: echo 'Using SonarQube'
- lf-infra-maven-sonar:
java-version: '{java-version}'
- shell: echo 'Using SonarQube'
- lf-infra-maven-sonar:
java-version: '{java-version}'
+ mvn-goals: '{mvn-goals}'
mvn-settings: '{mvn-settings}'
mvn-version: '{mvn-version}'
mvn-settings: '{mvn-settings}'
mvn-version: '{mvn-version}'
@@
-1176,7
+1213,9
@@
java-version: '{java-version}'
- inject:
# Switch this to the sonar wrapper when JJB 2.0 is available
java-version: '{java-version}'
- inject:
# Switch this to the sonar wrapper when JJB 2.0 is available
- properties-content: SONAR_HOST_URL=$SONAR_URL
+ properties-content: |
+ SONAR_HOST_URL=$SONAR_URL
+ MAVEN_GOALS={mvn-goals}
- lf-provide-maven-settings:
global-settings-file: global-settings
settings-file: '{mvn-settings}'
- lf-provide-maven-settings:
global-settings-file: global-settings
settings-file: '{mvn-settings}'
@@
-1199,6
+1238,7
@@
SONAR_HOST_URL=https://sonarcloud.io
PROJECT_KEY={sonarcloud-project-key}
PROJECT_ORGANIZATION={sonarcloud-project-organization}
SONAR_HOST_URL=https://sonarcloud.io
PROJECT_KEY={sonarcloud-project-key}
PROJECT_ORGANIZATION={sonarcloud-project-organization}
+ MAVEN_GOALS={mvn-goals}
API_TOKEN={sonarcloud-api-token}
- lf-provide-maven-settings:
global-settings-file: global-settings
API_TOKEN={sonarcloud-api-token}
- lf-provide-maven-settings:
global-settings-file: global-settings
@@
-1223,6
+1263,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
+1286,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
+1331,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:
@@
-1297,7
+1340,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
@@
-1348,6
+1391,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
+1426,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}'
@@
-1389,7
+1434,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:
@@
-1403,6
+1448,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
+1489,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
+1526,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}'
@@
-1484,7
+1534,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:
@@
-1517,6
+1567,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
+1621,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: