X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopflex%2Fopflex-custom.yaml;h=5d2b2e7e2e2ca8a01ef154759f4f349b6a29195c;hb=075d79fdad23501db894a5f51ec85de24fc4a02b;hp=bc59fd09a6558e9aa0926cdc8b026e7e9d81c426;hpb=d73cb2bc14859b41b38cb81a78288308da03d0a9;p=releng%2Fbuilder.git

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index bc59fd09a..5d2b2e7e2 100644
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -6,26 +6,21 @@
       - 'opflex-merge-{stream}'
 
     stream:
-      - oxygen:
+      - magnesium:
           branch: 'master'
           libuv-version: '1.8.0'
-          rapidjson-version: '1.0.2'
-          openvswitch-version: '2.6.0'
-      - nitrogen:
-          branch: 'stable/nitrogen'
+          rapidjson-version: '1.1.0'
+          openvswitch-version: '2.12.0'
+      - sodium:
+          branch: 'stable/sodium'
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
-      - carbon:
-          branch: 'stable/carbon'
+      - neon:
+          branch: 'stable/neon'
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
-      - boron:
-          branch: 'stable/boron'
-          libuv-version: '1.7.5'
-          rapidjson-version: '1.0.1'
-          openvswitch-version: 'noiro'
 
     project: 'opflex'
     archive-artifacts: '**/*.tar.gz'
@@ -34,10 +29,13 @@
 - job-template:
     name: 'opflex-verify-{stream}'
 
+    disable-job: false
+
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
     concurrent: true
-    jdk: '{jdk}'
+    jdk: '{java-version}'
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
@@ -77,10 +75,11 @@
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**'
+          forbidden-files: ''
 
     builders:
       - opflex-build:
@@ -96,8 +95,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:
@@ -137,9 +136,11 @@
 
     triggers:
       - gerrit-trigger-patch-merged:
-          server-name: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           name: 'opflex'
           branch: '{branch}'
+          files: '**'
+          forbidden-files: ''
 
     builders:
       - opflex-build: