X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopflex%2Fopflex-custom.yaml;h=2ace6c4ad9aacf6c928a3f8f0eaf838835c5ce13;hb=c792dd0bbcd7293ac7097d12a5170e7f69369a68;hp=7a228a46ce00092c35cb7a5b77faa20e88b73398;hpb=992a94ba358a92a4ed9348f9e3b050a7d43739a2;p=releng%2Fbuilder.git diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml index 7a228a46c..2ace6c4ad 100644 --- a/jjb/opflex/opflex-custom.yaml +++ b/jjb/opflex/opflex-custom.yaml @@ -6,11 +6,16 @@ - 'opflex-merge-{stream}' stream: - - oxygen: + - fluorine: branch: 'master' libuv-version: '1.8.0' rapidjson-version: '1.0.2' openvswitch-version: '2.6.0' + - oxygen: + branch: 'stable/oxygen' + libuv-version: '1.8.0' + rapidjson-version: '1.0.2' + openvswitch-version: '2.6.0' - nitrogen: branch: 'stable/nitrogen' libuv-version: '1.8.0' @@ -30,9 +35,9 @@ name: 'opflex-verify-{stream}' project-type: freestyle - node: centos7-java-builder-2c-8g + node: centos7-builder-2c-8g concurrent: true - jdk: '{jdk}' + jdk: '{java-version}' properties: - opendaylight-infra-properties: @@ -72,7 +77,7 @@ triggers: - gerrit-trigger-patch-submitted: - server: '{server-name}' + gerrit-server-name: '{gerrit-server-name}' project: '{project}' branch: '{branch}' files: '**' @@ -91,8 +96,8 @@ - job-template: name: 'opflex-merge-{stream}' - node: centos7-java-builder-2c-8g - jdk: '{jdk}' + node: centos7-builder-2c-8g + jdk: '{java-version}' properties: - opendaylight-infra-properties: @@ -132,7 +137,7 @@ triggers: - gerrit-trigger-patch-merged: - server-name: '{server-name}' + gerrit-server-name: '{gerrit-server-name}' name: 'opflex' branch: '{branch}'