X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fdmm%2Fdmm.yaml;h=274f6a441c7ceb93e7e96453b21943c0a9aee829;hb=6c837cefdf7161c0684f45970f3739d31cc326a2;hp=054350c510c2c007c81fb365f6d9e53ce6671c6c;hpb=29be786d3165364f61fadadf0fba430c2f377018;p=ci-management.git

diff --git a/jjb/dmm/dmm.yaml b/jjb/dmm/dmm.yaml
index 054350c51..274f6a441 100644
--- a/jjb/dmm/dmm.yaml
+++ b/jjb/dmm/dmm.yaml
@@ -21,6 +21,21 @@
       - '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'
@@ -29,12 +44,20 @@
     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
 
     build-discarder:
@@ -71,14 +94,13 @@
           !include-raw-escape: include-raw-dmm-test-checkstyle.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'dmm-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
 
     build-discarder:
@@ -115,15 +137,13 @@
           !include-raw-escape: include-raw-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'dmm-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
-
+    node: '{os}-builder-4c-4g'
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
       numToKeep: '{build-num-to-keep}'
@@ -158,15 +178,16 @@
           !include-raw-escape: include-raw-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'dmm-csit-verify-func-{stream}-{os}-virl'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
+    archive-artifacts: 'csit/archive/*.*'
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -179,6 +200,10 @@
           project: 'dmm'
       - gerrit-parameter:
           branch: '{branch}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -200,12 +225,15 @@
           !include-raw-escape: include-raw-dmm-csit-functional-virl.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'csit/report.html, csit/log.html, csit/output.xml'
-          latest-only: false
-
       - robot-report:
           output-path: 'csit'
+      - lf-infra-publish
 
-      - 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