X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopflex%2Fopflex-custom.yaml;h=9702ce9c814dec8a62c89e48daa75defcdca0a3a;hb=ddbf3cde9195f2b3635318fed187269504853ab1;hp=f097117e0c16f41f6f94f3a8c2009b681e865624;hpb=22151310cb7c9d2de7140e71fb6de3dd6aa3c018;p=releng%2Fbuilder.git

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index f097117e0..9702ce9c8 100644
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -6,44 +6,33 @@
       - 'opflex-merge-{stream}'
 
     stream:
-      - nitrogen:
+      - neon:
           branch: 'master'
-          jdk: openjdk8
-      - carbon:
-          branch: 'stable/carbon'
-          jdk: openjdk8
-      - boron:
-          branch: 'stable/boron'
-          jdk: openjdk8
+          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'
+      - oxygen:
+          branch: 'stable/oxygen'
+          libuv-version: '1.8.0'
+          rapidjson-version: '1.0.2'
+          openvswitch-version: '2.6.0'
 
     project: 'opflex'
     archive-artifacts: '**/*.tar.gz'
-
-- builder:
-    name: opflex-build
-    builders:
-      - maven-target:
-          maven-version: 'mvn33'
-          pom: genie/pom.xml
-          goals: compile
-      - copyartifact:
-          project: opflex-libuv_tgz-{stream}
-          flatten: true
-      - copyartifact:
-          project: opflex-rapidjson_tgz-{stream}
-          flatten: true
-      - copyartifact:
-          project: opflex-openvswitch_tgz-{stream}
-          flatten: true
-      - shell: !include-raw-escape: opflex-build.sh
+    jdk: 'openjdk8'
 
 - job-template:
     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:
@@ -56,6 +45,21 @@
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
+      - string:
+          name: LIBUV_VERSION
+          # yamllint disable-line rule:line-length
+          default: '{libuv-version}'
+          description: 'libuv version'
+      - string:
+          name: RAPIDJSON_VERSION
+          # yamllint disable-line rule:line-length
+          default: '{rapidjson-version}'
+          description: 'rapidjson version'
+      - string:
+          name: OPENVSWITCH_VERSION
+          # yamllint disable-line rule:line-length
+          default: '{openvswitch-version}'
+          description: 'openvswitch-version'
 
     scm:
       - gerrit-trigger-scm:
@@ -68,10 +72,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:
@@ -87,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:
@@ -100,7 +105,22 @@
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          artifacts: ''
+      - string:
+          name: LIBUV_VERSION
+          # yamllint disable-line rule:line-length
+          default: '{libuv-version}'
+          description: 'libuv version'
+      - string:
+          name: RAPIDJSON_VERSION
+          # yamllint disable-line rule:line-length
+          default: '{rapidjson-version}'
+          description: 'rapidjson version'
+      - string:
+          name: OPENVSWITCH_VERSION
+          # yamllint disable-line rule:line-length
+          default: '{openvswitch-version}'
+          description: 'openvswitch version'
 
     scm:
       - gerrit-trigger-scm:
@@ -113,9 +133,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: