X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopflex%2Fopflex-custom.yaml;h=68b7292da8dbb8c70feec3c8fe47e4c76b7daa02;hb=f93289b1fc422b77fcd00cfebe848c4eac982284;hp=73af4d97f23508ece216532b1e6c4ccf8800de51;hpb=fd2672716a0784da728735a33ab5ec34f800504f;p=releng%2Fbuilder.git

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index 73af4d97f..68b7292da 100644
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -1,130 +1,148 @@
+---
 - project:
     name: opflex
     jobs:
-        - 'opflex-verify-{stream}'
-        - 'opflex-merge-{stream}'
+      - 'opflex-verify-{stream}'
+      - 'opflex-merge-{stream}'
 
     stream:
-        - carbon:
-            branch: 'master'
-            jdk: openjdk8
-        - boron:
-            branch: 'stable/boron'
-            jdk: openjdk8
-        - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk8
+      - oxygen:
+          branch: 'master'
+          libuv-version: '1.8.0'
+          rapidjson-version: '1.0.2'
+          openvswitch-version: '2.6.0'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          libuv-version: '1.8.0'
+          rapidjson-version: '1.0.2'
+          openvswitch-version: '2.6.0'
+      - carbon:
+          branch: 'stable/carbon'
+          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:
-            - include-raw-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:
-            build-days-to-keep: '{build-days-to-keep}'
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
-        - opendaylight-infra-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          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:
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
 
     wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            server: '{server-name}'
-            project: '{project}'
-            branch: '{branch}'
-            files: '**'
+      - gerrit-trigger-patch-submitted:
+          gerrit-server-name: '{gerrit-server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '**'
 
     builders:
-        - opflex-build:
-            mvn33: 'mvn33'
-            stream: '{stream}'
+      - opflex-build:
+          mvn33: 'mvn33'
+          stream: '{stream}'
 
     publishers:
-        - email-notification:
-            email-recipients: '{email-recipients}'
-            email-prefix: '[opflex]'
-        - opendaylight-infra-shiplogs:
-            maven-version: 'mvn33'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[opflex]'
+      - lf-infra-publish
 
 - 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:
-            build-days-to-keep: '{build-days-to-keep}'
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
-        - opendaylight-infra-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          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:
-            refspec: ''
-            choosing-strategy: 'default'
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
 
     wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-patch-merged:
-            server-name: '{server-name}'
-            name: 'opflex'
-            branch: '{branch}'
+      - gerrit-trigger-patch-merged:
+          gerrit-server-name: '{gerrit-server-name}'
+          name: 'opflex'
+          branch: '{branch}'
 
     builders:
-        - opflex-build:
-            mvn33: 'mvn33'
-            stream: '{stream}'
+      - opflex-build:
+          mvn33: 'mvn33'
+          stream: '{stream}'
 
     publishers:
-        - email-notification:
-            email-recipients: '{email-recipients}'
-            email-prefix: '[opflex]'
-        - opendaylight-infra-shiplogs:
-            maven-version: 'mvn33'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[opflex]'
+      - lf-infra-publish