X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fdmm%2Fdmm.yaml;h=76c1a448b03678af096d1923e407ab763d28fad6;hb=7639d62b7b4fb5aa7e646f6e278f2f9edbc57d9d;hp=f0c0e6f9abd5d1875bb378376159c7a861971b7d;hpb=ece9b758b666def4b897450507211c2feddcad95;p=ci-management.git

diff --git a/jjb/dmm/dmm.yaml b/jjb/dmm/dmm.yaml
index f0c0e6f9a..76c1a448b 100644
--- a/jjb/dmm/dmm.yaml
+++ b/jjb/dmm/dmm.yaml
@@ -21,25 +21,46 @@
       - 'dmm-verify-{stream}-checkstyle'
       - 'dmm-verify-{stream}-{os}'
       - 'dmm-merge-{stream}-{os}'
+
+    project: 'dmm'
+    os: 'ubuntu1604'
+
+    stream:
+      - master:
+          branch: 'master'
+      - non-dpdk:
+          branch: 'none-dpdk'
+      - DMM-2:
+          branch: 'DMM-2'
+
+- project:
+    name: dmm-csit
+    jobs:
       - 'dmm-csit-verify-func-{stream}-{os}-virl'
 
     project: 'dmm'
-    os:
-      - ubuntu1604:
-          repo-os-part: 'ubuntu.xenial.main'
+    os: 'ubuntu1604'
 
     stream:
       - master:
           branch: 'master'
+      - DMM-2:
+          branch: 'DMM-2'
+
+- project:
+    name: dmm-view
+    views:
+      - project-view
+    project-name: dmm
 
 - job-template:
     name: 'dmm-verify-{stream}-checkstyle'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
       daysToKeep: '{build-days-to-keep}'
       numToKeep: '{build-num-to-keep}'
       artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -80,10 +101,10 @@
     name: 'dmm-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
       daysToKeep: '{build-days-to-keep}'
       numToKeep: '{build-num-to-keep}'
       artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -124,9 +145,8 @@
     name: 'dmm-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
-
-    logrotate:
+    node: '{os}-builder-4c-4g'
+    build-discarder:
       daysToKeep: '{build-days-to-keep}'
       numToKeep: '{build-num-to-keep}'
       artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -167,10 +187,10 @@
     name: 'dmm-csit-verify-func-{stream}-{os}-virl'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
       daysToKeep: '{build-days-to-keep}'
       numToKeep: '{build-num-to-keep}'
       artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -193,10 +213,9 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - gerrit-trigger-manually-triggered:
+      - gerrit-trigger-patch-submitted:
           name: 'dmm'
           branch: '{branch}'
-          comment-trigger-value: 'verify-dmm-func'
 
     builders:
       - shell:
@@ -204,7 +223,7 @@
 
     publishers:
       - archive-artifacts:
-          artifacts: 'csit/report.html, csit/log.html, csit/output.xml'
+          artifacts: 'csit/archive/*.*'
           latest-only: false
 
       - robot-report:
@@ -212,3 +231,12 @@
 
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
+
+- project:
+    name: dmm-info
+    project-name: dmm
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-4c-4g
+    project: dmm
+    branch: master