X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fdmm%2Fdmm.yaml;h=274f6a441c7ceb93e7e96453b21943c0a9aee829;hb=6ee4be148e0f6722186a207473d4812c010002d6;hp=20916db6649737288c556001efd9332376bae112;hpb=c03f721a0c677ad152ff6d83a997b144503f9a68;p=ci-management.git

diff --git a/jjb/dmm/dmm.yaml b/jjb/dmm/dmm.yaml
index 20916db66..274f6a441 100644
--- a/jjb/dmm/dmm.yaml
+++ b/jjb/dmm/dmm.yaml
@@ -21,7 +21,6 @@
       - 'dmm-verify-{stream}-checkstyle'
       - 'dmm-verify-{stream}-{os}'
       - 'dmm-merge-{stream}-{os}'
-      - 'dmm-csit-verify-func-master-{os}-virl'
 
     project: 'dmm'
     os: 'ubuntu1604'
@@ -31,12 +30,34 @@
           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'
+
+    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: ubuntu1604-builder-8c-8g
+    node: '{os}-builder-4c-4g'
     concurrent: true
 
     build-discarder:
@@ -73,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: ubuntu1604-builder-8c-8g
+    node: '{os}-builder-4c-4g'
     concurrent: true
 
     build-discarder:
@@ -117,14 +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: ubuntu1604-builder-8c-8g
+    node: '{os}-builder-4c-4g'
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
       numToKeep: '{build-num-to-keep}'
@@ -159,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-master-{os}-virl'
+    name: 'dmm-csit-verify-func-{stream}-{os}-virl'
 
     project-type: freestyle
-    node: ubuntu1604-builder-8c-8g
+    node: '{os}-builder-4c-4g'
     concurrent: true
+    archive-artifacts: 'csit/archive/*.*'
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -180,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:
@@ -201,12 +225,15 @@
           !include-raw-escape: include-raw-dmm-csit-functional-virl.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'csit/archive/*.*'
-          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