Create Neon jobs and bump fluorine branch

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

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index ffa23c14a1a4f2fc1bf08dd7736ae409e3af722c..9702ce9c814dec8a62c89e48daa75defcdca0a3a 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -6,18 +6,18 @@
       - 'opflex-merge-{stream}'
 
     stream:
-      - oxygen:
+      - neon:
           branch: 'master'
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
-      - nitrogen:
-          branch: 'stable/nitrogen'
+      - fluorine:
+          branch: 'stable/fluorine'
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
-      - carbon:
-          branch: 'stable/carbon'
+      - oxygen:
+          branch: 'stable/oxygen'
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
@@ -30,9 +30,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:
@@ -76,6 +76,7 @@
           project: '{project}'
           branch: '{branch}'
           files: '**'
+          forbidden-files: ''
 
     builders:
       - opflex-build:
@@ -91,8 +92,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:
@@ -135,6 +136,8 @@
           gerrit-server-name: '{gerrit-server-name}'
           name: 'opflex'
           branch: '{branch}'
+          files: '**'
+          forbidden-files: ''
 
     builders:
       - opflex-build: