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

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index 9f3d699a5..73af4d97f 100644
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -3,11 +3,7 @@
     jobs:
         - 'opflex-verify-{stream}'
         - 'opflex-merge-{stream}'
-#        - 'opflex-daily-{stream}'
-#        - 'opflex-distribution-{stream}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             branch: 'master'
@@ -26,7 +22,7 @@
     name: opflex-build
     builders:
       - maven-target:
-          maven-version: '{mvn33}'
+          maven-version: 'mvn33'
           pom: genie/pom.xml
           goals: compile
       - copyartifact:
@@ -50,11 +46,9 @@
     concurrent: true
     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:
@@ -74,19 +68,22 @@
 
     triggers:
         - gerrit-trigger-patch-submitted:
-            name: 'opflex'
+            server: '{server-name}'
+            project: '{project}'
             branch: '{branch}'
+            files: '**'
 
     builders:
         - opflex-build:
-            mvn33: '{mvn33}'
+            mvn33: 'mvn33'
             stream: '{stream}'
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[opflex]'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 - job-template:
     name: 'opflex-merge-{stream}'
@@ -94,11 +91,9 @@
     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:
@@ -118,16 +113,18 @@
 
     triggers:
         - gerrit-trigger-patch-merged:
+            server-name: '{server-name}'
             name: 'opflex'
             branch: '{branch}'
 
     builders:
         - opflex-build:
-            mvn33: '{mvn33}'
+            mvn33: 'mvn33'
             stream: '{stream}'
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[opflex]'
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'