Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Update branch cutting script"
[releng/builder.git]
/
jjb
/
autorelease
/
autorelease-templates.yaml
diff --git
a/jjb/autorelease/autorelease-templates.yaml
b/jjb/autorelease/autorelease-templates.yaml
index a34404c4eb01f9104ac74e27f04ef2703507f747..94141d55285bbd6b8745669e645b931e19a8d9b1 100644
(file)
--- a/
jjb/autorelease/autorelease-templates.yaml
+++ b/
jjb/autorelease/autorelease-templates.yaml
@@
-3,15
+3,24
@@
- job-template:
name: 'autorelease-release-{stream}'
- job-template:
name: 'autorelease-release-{stream}'
- project-type: freestyle
- node: centos7-autorelease-4c-16g
- jdk: '{jdk}'
- cron: 'H 0 * * *'
+ ############
+ # Defaults #
+ ############
- # Default variable values
+ build-node: '{build-node}'
+ java-version: openjdk8
mvn-version: mvn33
extra-mvn-opts: ''
mvn-version: mvn33
extra-mvn-opts: ''
+ #####################
+ # Job Configuration #
+ #####################
+
+ project-type: freestyle
+ node: '{build-node}'
+ jdk: '{java-version}'
+ cron: 'H 0 * * *'
+
properties:
- lf-infra-properties:
build-days-to-keep: 30
properties:
- lf-infra-properties:
build-days-to-keep: 30
@@
-145,7
+154,7
@@
- job-template:
name: autorelease-update-validate-jobs-{stream}
project-type: freestyle
- job-template:
name: autorelease-update-validate-jobs-{stream}
project-type: freestyle
- node: centos7-
java-builder-2c-4
g
+ node: centos7-
builder-2c-1
g
properties:
- lf-infra-properties:
properties:
- lf-infra-properties:
@@
-190,8
+199,7
@@
jenkins-ssh-credential: opendaylight-jenkins-ssh
builders:
jenkins-ssh-credential: opendaylight-jenkins-ssh
builders:
- - shell: !include-raw-escape:
- - update-validate-autorelease-projects.sh
+ - autorelease-update-validate-projects
- opendaylight-infra-push-gerrit-patch:
project: 'releng/builder'
gerrit-topic: 'autorelease-update-validate-jobs-{stream}'
- opendaylight-infra-push-gerrit-patch:
project: 'releng/builder'
gerrit-topic: 'autorelease-update-validate-jobs-{stream}'
@@
-204,7
+212,7
@@
- job-template:
name: autorelease-version-bump-{stream}
project-type: freestyle
- job-template:
name: autorelease-version-bump-{stream}
project-type: freestyle
- node:
centos7-autorelease-4c-16g
+ node:
'{build-node}'
properties:
- opendaylight-infra-properties:
properties:
- opendaylight-infra-properties:
@@
-278,7
+286,7
@@
#####################
project-type: freestyle
#####################
project-type: freestyle
- node: centos7-
java-builder-2c-4
g
+ node: centos7-
builder-2c-8
g
properties:
- lf-infra-properties:
properties:
- lf-infra-properties:
@@
-327,12
+335,24
@@
- job-template:
name: '{project-name}-validate-autorelease-{stream}'
- job-template:
name: '{project-name}-validate-autorelease-{stream}'
- disabled: false
+ ############
+ # Defaults #
+ ############
+
+ java-version: openjdk8
+
+ #####################
+ # Job Configuration #
+ #####################
+
+ disabled: false
project-type: freestyle
project-type: freestyle
- node: '{build-node}'
+ # Note: This NEEDS to be hardcoded as projects should NOT be allowed to
+ # override the build node.
+ node: centos7-builder-2c-8g
concurrent: true
concurrent: true
- jdk:
openjdk8
+ jdk:
'{java-version}'
properties:
- lf-infra-properties:
properties:
- lf-infra-properties:
@@
-369,7
+389,7
@@
triggers:
- gerrit-trigger-patch-submitted:
triggers:
- gerrit-trigger-patch-submitted:
-
server: '{
server-name}'
+
gerrit-server-name: '{gerrit-
server-name}'
project: '{project}'
branch: '{branch}'
files: '**/*.xml'
project: '{project}'
branch: '{branch}'
files: '**/*.xml'
@@
-399,6
+419,8
@@
settings-type: cfp
global-settings: global-settings
global-settings-type: cfp
settings-type: cfp
global-settings: global-settings
global-settings-type: cfp
+ # Hack to workaround the duplicate-finder plugin in odlparent breaking validate-autorelease
+ - shell: sed -i 's/validate/none/' /tmp/r/org/opendaylight/odlparent/odlparent/3.0.2/odlparent-3.0.2.pom
- maven-target:
maven-version: mvn33
pom: pom.xml
- maven-target:
maven-version: mvn33
pom: pom.xml