Fix for CSIT of VTN Openstack newton jobs

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

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index 658063d7440869dea193c3c0481d3c43e4f81505..73af4d97f23508ece216532b1e6c4ccf8800de51 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -3,8 +3,6 @@
     jobs:
         - 'opflex-verify-{stream}'
         - 'opflex-merge-{stream}'
-#        - 'opflex-daily-{stream}'
-#        - 'opflex-distribution-{stream}'
 
     stream:
         - carbon:
@@ -48,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:
@@ -72,8 +68,10 @@
 
     triggers:
         - gerrit-trigger-patch-submitted:
-            name: 'opflex'
+            server: '{server-name}'
+            project: '{project}'
             branch: '{branch}'
+            files: '**'
 
     builders:
         - opflex-build:
@@ -93,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:
@@ -117,6 +113,7 @@
 
     triggers:
         - gerrit-trigger-patch-merged:
+            server-name: '{server-name}'
             name: 'opflex'
             branch: '{branch}'