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
Remove jjb custom scripting
[releng/builder.git]
/
jjb
/
opflex
/
opflex-custom.yaml
diff --git
a/jjb/opflex/opflex-custom.yaml
b/jjb/opflex/opflex-custom.yaml
index 6e26c44e427d2530e96bb8fb0ad25344c43f07ca..0bfc67a28918f740c2ba24e10a61f94d3168626b 100644
(file)
--- a/
jjb/opflex/opflex-custom.yaml
+++ b/
jjb/opflex/opflex-custom.yaml
@@
-9,11
+9,16
@@
# stream: release stream (eg. stable-lithium or beryllium)
# branch: git branch (eg. stable/lithium or master)
stream:
# stream: release stream (eg. stable-lithium or beryllium)
# branch: git branch (eg. stable/lithium or master)
stream:
- - b
eryllium
:
+ - b
oron
:
branch: 'master'
jdk: openjdk7
jdks:
- openjdk7
branch: 'master'
jdk: openjdk7
jdks:
- openjdk7
+ - beryllium:
+ branch: 'stable/beryllium'
+ jdk: openjdk7
+ jdks:
+ - openjdk7
project: 'opflex'
project: 'opflex'
@@
-34,7
+39,8
@@
project: opflex-openvswitch_tgz-{stream}
flatten: true
- shell:
project: opflex-openvswitch_tgz-{stream}
flatten: true
- shell:
- !include-raw-escape include-raw-opflex-build.sh
+ !include-raw-escape:
+ - include-raw-opflex-build.sh
- job-template:
name: 'opflex-verify-{stream}'
- job-template:
name: 'opflex-verify-{stream}'
@@
-48,7
+54,7
@@
type: slave
name: nodes
values:
type: slave
name: nodes
values:
- -
dynamic_verify
+ -
centos7-java-builder-2c-8g
- axis:
type: jdk
values: '{obj:jdks}'
- axis:
type: jdk
values: '{obj:jdks}'
@@
-60,24
+66,20
@@
artifactNumToKeep: '{build-artifact-num-to-keep}'
parameters:
artifactNumToKeep: '{build-artifact-num-to-keep}'
parameters:
- -
project-parameter
:
+ -
opendaylight-infra-parameters
:
project: '{project}'
project: '{project}'
- - gerrit-parameter:
branch: '{branch}'
branch: '{branch}'
- - gerrit-refspec-parameter:
-
refspec: '
'
+ refspec: 'refs/heads/{branch}'
+
artifacts: '{archive-artifacts}
'
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
wrappers:
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
wrappers:
- - build-timeout
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - opendaylight-infra-wrappers:
+ build-timeout: '{build-timeout}'
triggers:
- gerrit-trigger-patch-submitted:
triggers:
- gerrit-trigger-patch-submitted:
@@
-96,7
+98,7
@@
- job-template:
name: 'opflex-merge-{stream}'
- job-template:
name: 'opflex-merge-{stream}'
- node:
dynamic_merge
+ node:
centos7-java-builder-2c-8g
jdk: '{jdk}'
logrotate:
jdk: '{jdk}'
logrotate:
@@
-106,22
+108,20
@@
artifactNumToKeep: '{build-artifact-num-to-keep}'
parameters:
artifactNumToKeep: '{build-artifact-num-to-keep}'
parameters:
- -
project-parameter
:
+ -
opendaylight-infra-parameters
:
project: '{project}'
project: '{project}'
- - gerrit-parameter:
branch: '{branch}'
branch: '{branch}'
+ refspec: 'refs/heads/{branch}'
+ artifacts: '{archive-artifacts}'
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
refspec: ''
choosing-strategy: 'default'
wrappers:
refspec: ''
choosing-strategy: 'default'
wrappers:
- - build-timeout
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - opendaylight-infra-wrappers:
+ build-timeout: '{build-timeout}'
triggers:
- gerrit-trigger-patch-merged:
triggers:
- gerrit-trigger-patch-merged: