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
Update automated project templates
[releng/builder.git]
/
jjb
/
iotdm
/
iotdm.yaml
diff --git
a/jjb/iotdm/iotdm.yaml
b/jjb/iotdm/iotdm.yaml
index 2450d38788cedc28655d224d9724f0367cefa428..80560a7e412d99e8f9b69b29948f940d4b721e90 100644
(file)
--- a/
jjb/iotdm/iotdm.yaml
+++ b/
jjb/iotdm/iotdm.yaml
@@
-15,10
+15,10
@@
- 'iotdm-clm-{stream}'
- 'iotdm-clm-{stream}'
- # stream:
branch with - in place of / (eg. stable-he
lium)
- # branch:
branch (eg. stable/helium
)
+ # stream:
release stream (eg. stable-lithium or beryl
lium)
+ # branch:
git branch (eg. stable/lithium or master
)
stream:
stream:
- -
master
:
+ -
beryllium
:
branch: 'master'
jdk: openjdk7
jdks:
branch: 'master'
jdk: openjdk7
jdks:
@@
-34,7
+34,8
@@
project: 'iotdm'
# For the Job templates below replace instances of:
project: 'iotdm'
# For the Job templates below replace instances of:
-# PROJECT with your project name (eg. controller)
+# PROJECT_SHORTNAME with your project name (eg. circuitsw)
+# PROJECT_PATH with your project name (eg. ofextensions/circuitsw)
# MAVEN_GOALS with your maven goals to build
# MAVEN_OPTS with your maven options to build
# MAVEN_GOALS with your maven goals to build
# MAVEN_OPTS with your maven options to build
@@
-46,8
+47,8
@@
# The purpose of this job template is to setup a ODL verify job
#
# Required Variables:
# The purpose of this job template is to setup a ODL verify job
#
# Required Variables:
- # stream:
branch with - in place of / (eg. stable-he
lium)
- # branch:
branch (eg. stable/helium
)
+ # stream:
release stream (eg. stable-lithium or beryl
lium)
+ # branch:
git branch (eg. stable/lithium or master
)
project-type: matrix
node: matrix_master
project-type: matrix
node: matrix_master
@@
-95,6
+96,9
@@
builders:
- wipe-org-opendaylight-repo
- jacoco-nojava-workaround
builders:
- wipe-org-opendaylight-repo
- jacoco-nojava-workaround
+ - provide-maven-settings:
+ global-settings-file: '{odl-global-settings}'
+ settings-file: '{yangtools-settings}'
- maven-target:
maven-version: '{mvn33}'
pom: 'pom.xml'
- maven-target:
maven-version: '{mvn33}'
pom: 'pom.xml'
@@
-119,8
+123,8
@@
# and deploy artifacts to Nexus.
#
# Required Variables:
# and deploy artifacts to Nexus.
#
# Required Variables:
- # stream:
branch with - in place of / (eg. stable-he
lium)
- # branch:
branch (eg. stable/helium
)
+ # stream:
release stream (eg. stable-lithium or beryl
lium)
+ # branch:
git branch (eg. stable/lithium or master
)
project-type: maven
node: dynamic_merge
project-type: maven
node: dynamic_merge
@@
-156,6
+160,9
@@
prebuilders:
- wipe-org-opendaylight-repo
- jacoco-nojava-workaround
prebuilders:
- wipe-org-opendaylight-repo
- jacoco-nojava-workaround
+ - provide-maven-settings:
+ global-settings-file: '{odl-global-settings}'
+ settings-file: '{yangtools-settings}'
maven:
maven-name: '{mvn33}'
maven:
maven-name: '{mvn33}'
@@
-186,8
+193,8
@@
# builder and pushes to Sonar analysis.
#
# Required Variables:
# builder and pushes to Sonar analysis.
#
# Required Variables:
- # stream:
branch with - in place of / (eg. stable-he
lium)
- # branch:
branch (eg. stable/helium
)
+ # stream:
release stream (eg. stable-lithium or beryl
lium)
+ # branch:
git branch (eg. stable/lithium or master
)
project-type: maven
node: dynamic_verify
project-type: maven
node: dynamic_verify
@@
-221,6
+228,9
@@
prebuilders:
- wipe-org-opendaylight-repo
- jacoco-nojava-workaround
prebuilders:
- wipe-org-opendaylight-repo
- jacoco-nojava-workaround
+ - provide-maven-settings:
+ global-settings-file: '{odl-global-settings}'
+ settings-file: '{yangtools-settings}'
maven:
maven-name: '{mvn33}'
maven:
maven-name: '{mvn33}'
@@
-241,6
+251,10
@@
- job-template:
name: 'iotdm-distribution-{stream}'
- job-template:
name: 'iotdm-distribution-{stream}'
+ # Required variables:
+ # stream: release stream (eg. stable-lithium or beryllium)
+ # branch: git branch (eg. stable/lithium or master)
+
project-type: maven
node: dynamic_merge
jdk: '{jdk}'
project-type: maven
node: dynamic_merge
jdk: '{jdk}'
@@
-274,6
+288,9
@@
prebuilders:
- wipe-org-opendaylight-repo
prebuilders:
- wipe-org-opendaylight-repo
+ - provide-maven-settings:
+ global-settings-file: '{odl-global-settings}'
+ settings-file: '{yangtools-settings}'
maven:
maven-name: '{mvn33}'
maven:
maven-name: '{mvn33}'
@@
-302,8
+319,8
@@
# is successfully built.
#
# Required Variables:
# is successfully built.
#
# Required Variables:
- # stream:
branch with - in place of / (eg. stable-he
lium)
- # branch:
branch (eg. stable/helium
)
+ # stream:
release stream (eg. stable-lithium or beryl
lium)
+ # branch:
git branch (eg. stable/lithium or master
)
project-type: maven
node: dynamic_merge
project-type: maven
node: dynamic_merge
@@
-339,6
+356,9
@@
prebuilders:
- wipe-org-opendaylight-repo
- jacoco-nojava-workaround
prebuilders:
- wipe-org-opendaylight-repo
- jacoco-nojava-workaround
+ - provide-maven-settings:
+ global-settings-file: '{odl-global-settings}'
+ settings-file: '{yangtools-settings}'
maven:
maven-name: '{mvn33}'
maven:
maven-name: '{mvn33}'
@@
-387,10
+407,15
@@
triggers:
- timed: 'H H * * *'
triggers:
- timed: 'H H * * *'
+ - gerrit-trigger-patch-sonar:
+ name: 'iotdm'
prebuilders:
- wipe-org-opendaylight-repo
- jacoco-nojava-workaround
prebuilders:
- wipe-org-opendaylight-repo
- jacoco-nojava-workaround
+ - provide-maven-settings:
+ global-settings-file: '{odl-global-settings}'
+ settings-file: '{yangtools-settings}'
maven:
maven-name: '{mvn33}'
maven:
maven-name: '{mvn33}'
@@
-445,6
+470,9
@@
prebuilders:
- wipe-org-opendaylight-repo
prebuilders:
- wipe-org-opendaylight-repo
+ - provide-maven-settings:
+ global-settings-file: '{odl-global-settings}'
+ settings-file: '{yangtools-settings}'
maven:
maven-name: '{mvn33}'
maven:
maven-name: '{mvn33}'