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
/
sfc
/
sfc.yaml
diff --git
a/jjb/sfc/sfc.yaml
b/jjb/sfc/sfc.yaml
index 42e27b58ff22573e77db8d7901c70ba3799c7fd7..0a4c9d287794701a8dab62461a9365f32e1e26e6 100644
(file)
--- a/
jjb/sfc/sfc.yaml
+++ b/
jjb/sfc/sfc.yaml
@@
-15,21
+15,21
@@
- 'sfc-clm-{stream}'
- 'sfc-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:
- openjdk7
branch: 'master'
jdk: openjdk7
jdks:
- openjdk7
- - stable-
hel
ium:
- branch: 'stable/
hel
ium'
+ - stable-
lith
ium:
+ branch: 'stable/
lith
ium'
jdk: openjdk7
jdks:
- openjdk7
jdk: openjdk7
jdks:
- openjdk7
- - stable-
lith
ium:
- branch: 'stable/
lith
ium'
+ - stable-
hel
ium:
+ branch: 'stable/
hel
ium'
jdk: openjdk7
jdks:
- openjdk7
jdk: openjdk7
jdks:
- openjdk7
@@
-37,7
+37,8
@@
project: 'sfc'
# For the Job templates below replace instances of:
project: 'sfc'
# 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
@@
-49,8
+50,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
@@
-98,6
+99,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: '{sfc-settings}'
- maven-target:
maven-version: '{mvn33}'
pom: 'pom.xml'
- maven-target:
maven-version: '{mvn33}'
pom: 'pom.xml'
@@
-122,8
+126,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
@@
-159,6
+163,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: '{sfc-settings}'
maven:
maven-name: '{mvn33}'
maven:
maven-name: '{mvn33}'
@@
-189,8
+196,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
@@
-224,6
+231,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: '{sfc-settings}'
maven:
maven-name: '{mvn33}'
maven:
maven-name: '{mvn33}'
@@
-244,6
+254,10
@@
- job-template:
name: 'sfc-distribution-{stream}'
- job-template:
name: 'sfc-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}'
@@
-277,6
+291,9
@@
prebuilders:
- wipe-org-opendaylight-repo
prebuilders:
- wipe-org-opendaylight-repo
+ - provide-maven-settings:
+ global-settings-file: '{odl-global-settings}'
+ settings-file: '{sfc-settings}'
maven:
maven-name: '{mvn33}'
maven:
maven-name: '{mvn33}'
@@
-305,8
+322,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
@@
-342,6
+359,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: '{sfc-settings}'
maven:
maven-name: '{mvn33}'
maven:
maven-name: '{mvn33}'
@@
-396,6
+416,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: '{sfc-settings}'
maven:
maven-name: '{mvn33}'
maven:
maven-name: '{mvn33}'
@@
-450,6
+473,9
@@
prebuilders:
- wipe-org-opendaylight-repo
prebuilders:
- wipe-org-opendaylight-repo
+ - provide-maven-settings:
+ global-settings-file: '{odl-global-settings}'
+ settings-file: '{sfc-settings}'
maven:
maven-name: '{mvn33}'
maven:
maven-name: '{mvn33}'