Sodium branch cutting

[releng/builder.git] / jjb / opflex / opflex-custom.yaml

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index 7a228a46ce00092c35cb7a5b77faa20e88b73398..03875ddff89d83ecda7f26df9556e1f69a351cd5 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -6,18 +6,23 @@
       - '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'
+      - 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'
+      - fluorine:
+          branch: 'stable/fluorine'
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
@@ -29,10 +34,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:
@@ -72,10 +80,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:
@@ -91,8 +100,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,9 +141,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: