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 "Add a new job for TSDR elasticSearch"
[releng/builder.git]
/
jjb
/
opflex
/
opflex-custom.yaml
diff --git
a/jjb/opflex/opflex-custom.yaml
b/jjb/opflex/opflex-custom.yaml
index 9f3d699a5c8a97232f4b992d579cae46c745f2f7..7ca6e65cf339afb0c271b64b8afc025ba0230bfc 100644
(file)
--- a/
jjb/opflex/opflex-custom.yaml
+++ b/
jjb/opflex/opflex-custom.yaml
@@
-1,23
+1,20
@@
+---
- project:
name: opflex
jobs:
- project:
name: opflex
jobs:
- - 'opflex-verify-{stream}'
- - 'opflex-merge-{stream}'
-# - 'opflex-daily-{stream}'
-# - 'opflex-distribution-{stream}'
+ - 'opflex-verify-{stream}'
+ - 'opflex-merge-{stream}'
- # stream: release stream (eg. stable-lithium or beryllium)
- # branch: git branch (eg. stable/lithium or master)
stream:
stream:
-
- carbon:
-
branch: 'master'
-
jdk: openjdk8
-
- boron:
-
branch: 'stable/boron'
-
jdk: openjdk8
-
- beryllium:
-
branch: 'stable/beryllium'
-
jdk: openjdk8
+ - carbon:
+ branch: 'master'
+ jdk: openjdk8
+ - boron:
+ branch: 'stable/boron'
+ jdk: openjdk8
+ - beryllium:
+ branch: 'stable/beryllium'
+ jdk: openjdk8
project: 'opflex'
archive-artifacts: '**/*.tar.gz'
project: 'opflex'
archive-artifacts: '**/*.tar.gz'
@@
-26,7
+23,7
@@
name: opflex-build
builders:
- maven-target:
name: opflex-build
builders:
- maven-target:
- maven-version: '
{mvn33}
'
+ maven-version: '
mvn33
'
pom: genie/pom.xml
goals: compile
- copyartifact:
pom: genie/pom.xml
goals: compile
- copyartifact:
@@
-38,9
+35,7
@@
- copyartifact:
project: opflex-openvswitch_tgz-{stream}
flatten: true
- copyartifact:
project: opflex-openvswitch_tgz-{stream}
flatten: true
- - shell:
- !include-raw-escape:
- - include-raw-opflex-build.sh
+ - shell: !include-raw-escape: include-raw-opflex-build.sh
- job-template:
name: 'opflex-verify-{stream}'
- job-template:
name: 'opflex-verify-{stream}'
@@
-50,43
+45,44
@@
concurrent: true
jdk: '{jdk}'
concurrent: true
jdk: '{jdk}'
- logrotate:
- daysToKeep: '{build-days-to-keep}'
- numToKeep: '{build-num-to-keep}'
- artifactDaysToKeep: '{build-artifact-days-to-keep}'
- artifactNumToKeep: '{build-artifact-num-to-keep}'
+ properties:
+ - opendaylight-infra-properties:
+ build-days-to-keep: '{build-days-to-keep}'
parameters:
parameters:
-
- opendaylight-infra-parameters:
-
project: '{project}'
-
branch: '{branch}'
-
refspec: 'refs/heads/{branch}'
-
artifacts: '{archive-artifacts}'
+ - opendaylight-infra-parameters:
+ project: '{project}'
+ branch: '{branch}'
+ refspec: 'refs/heads/{branch}'
+ artifacts: '{archive-artifacts}'
scm:
scm:
-
- gerrit-trigger-scm:
-
refspec: '$GERRIT_REFSPEC'
-
choosing-strategy: 'gerrit'
+ - gerrit-trigger-scm:
+ refspec: '$GERRIT_REFSPEC'
+ choosing-strategy: 'gerrit'
wrappers:
wrappers:
-
- opendaylight-infra-wrappers:
-
build-timeout: '{build-timeout}'
+ - opendaylight-infra-wrappers:
+ build-timeout: '{build-timeout}'
triggers:
triggers:
- - gerrit-trigger-patch-submitted:
- name: 'opflex'
- branch: '{branch}'
+ - gerrit-trigger-patch-submitted:
+ server: '{server-name}'
+ project: '{project}'
+ branch: '{branch}'
+ files: '**'
builders:
builders:
-
- opflex-build:
-
mvn33: '{mvn33}
'
-
stream: '{stream}'
+ - opflex-build:
+
mvn33: 'mvn33
'
+ stream: '{stream}'
publishers:
publishers:
- - email-notification:
- email-prefix: '[opflex]'
- - opendaylight-infra-shiplogs:
- maven-version: '{mvn33}'
+ - email-notification:
+ email-recipients: '{email-recipients}'
+ email-prefix: '[opflex]'
+ - opendaylight-infra-shiplogs:
+ maven-version: 'mvn33'
- job-template:
name: 'opflex-merge-{stream}'
- job-template:
name: 'opflex-merge-{stream}'
@@
-94,40
+90,40
@@
node: centos7-java-builder-2c-8g
jdk: '{jdk}'
node: centos7-java-builder-2c-8g
jdk: '{jdk}'
- logrotate:
- daysToKeep: '{build-days-to-keep}'
- numToKeep: '{build-num-to-keep}'
- artifactDaysToKeep: '{build-artifact-days-to-keep}'
- artifactNumToKeep: '{build-artifact-num-to-keep}'
+ properties:
+ - opendaylight-infra-properties:
+ build-days-to-keep: '{build-days-to-keep}'
parameters:
parameters:
-
- opendaylight-infra-parameters:
-
project: '{project}'
-
branch: '{branch}'
-
refspec: 'refs/heads/{branch}'
-
artifacts: '{archive-artifacts}'
+ - opendaylight-infra-parameters:
+ project: '{project}'
+ branch: '{branch}'
+ refspec: 'refs/heads/{branch}'
+ artifacts: '{archive-artifacts}'
scm:
scm:
-
- gerrit-trigger-scm:
-
refspec: ''
-
choosing-strategy: 'default'
+ - gerrit-trigger-scm:
+ refspec: ''
+ choosing-strategy: 'default'
wrappers:
wrappers:
-
- opendaylight-infra-wrappers:
-
build-timeout: '{build-timeout}'
+ - opendaylight-infra-wrappers:
+ build-timeout: '{build-timeout}'
triggers:
triggers:
- - gerrit-trigger-patch-merged:
- name: 'opflex'
- branch: '{branch}'
+ - gerrit-trigger-patch-merged:
+ server-name: '{server-name}'
+ name: 'opflex'
+ branch: '{branch}'
builders:
builders:
-
- opflex-build:
-
mvn33: '{mvn33}
'
-
stream: '{stream}'
+ - opflex-build:
+
mvn33: 'mvn33
'
+ stream: '{stream}'
publishers:
publishers:
- - email-notification:
- email-prefix: '[opflex]'
- - opendaylight-infra-shiplogs:
- maven-version: '{mvn33}'
+ - email-notification:
+ email-recipients: '{email-recipients}'
+ email-prefix: '[opflex]'
+ - opendaylight-infra-shiplogs:
+ maven-version: 'mvn33'