X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopflex%2Fopflex-custom.yaml;h=f097117e0c16f41f6f94f3a8c2009b681e865624;hb=ad55d5440b3f444c7a2d202d65765eb1aa1e5323;hp=0bfc67a28918f740c2ba24e10a61f94d3168626b;hpb=f5355c3bc08fcb916ba48be2db11941ed0e14eef;p=releng%2Fbuilder.git

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index 0bfc67a28..f097117e0 100644
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -1,32 +1,29 @@
+---
 - project:
     name: opflex
     jobs:
-        - 'opflex-verify-{stream}'
-        - 'opflex-merge-{stream}'
-#        - 'opflex-daily-{stream}'
-#        - 'opflex-distribution-{stream}'
+      - 'opflex-verify-{stream}'
+      - 'opflex-merge-{stream}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - boron:
-            branch: 'master'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-        - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
+      - nitrogen:
+          branch: 'master'
+          jdk: openjdk8
+      - carbon:
+          branch: 'stable/carbon'
+          jdk: openjdk8
+      - boron:
+          branch: 'stable/boron'
+          jdk: openjdk8
 
     project: 'opflex'
+    archive-artifacts: '**/*.tar.gz'
 
 - builder:
     name: opflex-build
     builders:
       - maven-target:
-          maven-version: '{mvn33}'
+          maven-version: 'mvn33'
           pom: genie/pom.xml
           goals: compile
       - copyartifact:
@@ -38,62 +35,54 @@
       - copyartifact:
           project: opflex-openvswitch_tgz-{stream}
           flatten: true
-      - shell:
-          !include-raw-escape:
-            - include-raw-opflex-build.sh
+      - shell: !include-raw-escape: opflex-build.sh
 
 - job-template:
     name: 'opflex-verify-{stream}'
 
-    project-type: matrix
-    node: matrix_master
+    project-type: freestyle
+    node: centos7-java-builder-2c-8g
     concurrent: true
+    jdk: '{jdk}'
 
-    axes:
-        - axis:
-            type: slave
-            name: nodes
-            values:
-                - centos7-java-builder-2c-8g
-        - axis:
-            type: jdk
-            values: '{obj:jdks}'
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - 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}'
 
     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:
-            name: 'opflex'
-            branch: '{branch}'
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '**'
 
     builders:
-        - opflex-build:
-            mvn33: '{mvn33}'
-            stream: '{stream}'
+      - opflex-build:
+          mvn33: 'mvn33'
+          stream: '{stream}'
 
     publishers:
-        - email-notification:
-            email-prefix: '[opflex]'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[opflex]'
+      - lf-infra-publish
 
 - job-template:
     name: 'opflex-merge-{stream}'
@@ -101,40 +90,40 @@
     node: centos7-java-builder-2c-8g
     jdk: '{jdk}'
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - 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}'
 
     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:
-            name: 'opflex'
-            branch: '{branch}'
+      - gerrit-trigger-patch-merged:
+          server-name: '{server-name}'
+          name: 'opflex'
+          branch: '{branch}'
 
     builders:
-        - opflex-build:
-            mvn33: '{mvn33}'
-            stream: '{stream}'
+      - opflex-build:
+          mvn33: 'mvn33'
+          stream: '{stream}'
 
     publishers:
-        - email-notification:
-            email-prefix: '[opflex]'
-        - archive:
-            artifacts: '**/*.tar.gz'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[opflex]'
+      - lf-infra-publish