Updating the new branch of DMM

[ci-management.git] / jjb / dmm / dmm.yaml

diff --git a/jjb/dmm/dmm.yaml b/jjb/dmm/dmm.yaml
index 3a94a13..e87b458 100644 (file)
--- a/jjb/dmm/dmm.yaml
+++ b/jjb/dmm/dmm.yaml
@@ -21,7 +21,7 @@
       - 'dmm-verify-{stream}-checkstyle'
       - 'dmm-verify-{stream}-{os}'
       - 'dmm-merge-{stream}-{os}'
-      - 'dmm-csit-verify-func-{stream}-{os}-virl'
+      - 'dmm-csit-verify-func-master-{os}-virl'
 
     project: 'dmm'
     os: 'ubuntu1604'
@@ -29,6 +29,8 @@
     stream:
       - master:
           branch: 'master'
+      - non-dpdk:
+          branch: 'none-dpdk'
 
 - job-template:
     name: 'dmm-verify-{stream}-checkstyle'
@@ -37,7 +39,7 @@
     node: '{os}-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
       daysToKeep: '{build-days-to-keep}'
       numToKeep: '{build-num-to-keep}'
       artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -81,7 +83,7 @@
     node: '{os}-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
       daysToKeep: '{build-days-to-keep}'
       numToKeep: '{build-num-to-keep}'
       artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -124,7 +126,7 @@
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
 
-    logrotate:
+    build-discarder:
       daysToKeep: '{build-days-to-keep}'
       numToKeep: '{build-num-to-keep}'
       artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -162,13 +164,13 @@
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'dmm-csit-verify-func-{stream}-{os}-virl'
+    name: 'dmm-csit-verify-func-master-{os}-virl'
 
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
       daysToKeep: '{build-days-to-keep}'
       numToKeep: '{build-num-to-keep}'
       artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -201,7 +203,7 @@
 
     publishers:
       - archive-artifacts:
-          artifacts: 'csit/report.html, csit/log.html, csit/output.xml'
+          artifacts: 'csit/archive/*.*'
           latest-only: false
 
       - robot-report: