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

diff --git a/jjb/dmm/dmm.yaml b/jjb/dmm/dmm.yaml
index 3801be9d9..274f6a441 100644
--- a/jjb/dmm/dmm.yaml
+++ b/jjb/dmm/dmm.yaml
@@ -1,3 +1,4 @@
+---
 #########################################################################
 #
 # Copyright (c) 2018 Huawei Technologies Co.,Ltd.
@@ -17,197 +18,222 @@
 - project:
     name: dmm
     jobs:
-        - 'dmm-verify-{stream}-checkstyle'
-        - 'dmm-verify-{stream}-{os}'
-        - 'dmm-merge-{stream}-{os}'
-        - 'dmm-csit-verify-func-{stream}-{os}-virl'
+      - 'dmm-verify-{stream}-checkstyle'
+      - 'dmm-verify-{stream}-{os}'
+      - 'dmm-merge-{stream}-{os}'
 
     project: 'dmm'
-    os:
-        - ubuntu1604:
-            repo-os-part: 'ubuntu.xenial.main'
+    os: 'ubuntu1604'
 
     stream:
-        - master:
-            branch: 'master'
+      - 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'
+
+    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:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    build-discarder:
+      daysToKeep: '{build-days-to-keep}'
+      numToKeep: '{build-num-to-keep}'
+      artifactDaysToKeep: '{build-artifact-days-to-keep}'
+      artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
-            project: 'dmm'
-        - gerrit-parameter:
-            branch: '{branch}'
-        - os-parameter:
-            os: '{os}'
+      - project-parameter:
+          project: 'dmm'
+      - gerrit-parameter:
+          branch: '{branch}'
+      - os-parameter:
+          os: '{os}'
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+      - gerrit-trigger-scm:
+          credentials-id: 'jenkins-gerrit-credentials'
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
 
     wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - fdio-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'dmm'
-            branch: '{branch}'
+      - gerrit-trigger-patch-submitted:
+          name: 'dmm'
+          branch: '{branch}'
 
     builders:
-        - shell:
-            !include-raw-escape: include-raw-dmm-test-checkstyle.sh
+      - shell:
+          !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
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    build-discarder:
+      daysToKeep: '{build-days-to-keep}'
+      numToKeep: '{build-num-to-keep}'
+      artifactDaysToKeep: '{build-artifact-days-to-keep}'
+      artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
-            project: 'dmm'
-        - gerrit-parameter:
-            branch: '{branch}'
-        - os-parameter:
-            os: '{os}'
+      - project-parameter:
+          project: 'dmm'
+      - gerrit-parameter:
+          branch: '{branch}'
+      - os-parameter:
+          os: '{os}'
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+      - gerrit-trigger-scm:
+          credentials-id: 'jenkins-gerrit-credentials'
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
 
     wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - fdio-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'dmm'
-            branch: '{branch}'
+      - gerrit-trigger-patch-submitted:
+          name: 'dmm'
+          branch: '{branch}'
 
     builders:
-        - shell:
-            !include-raw-escape: include-raw-build.sh
+      - shell:
+          !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'
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    node: '{os}-builder-4c-4g'
+    build-discarder:
+      daysToKeep: '{build-days-to-keep}'
+      numToKeep: '{build-num-to-keep}'
+      artifactDaysToKeep: '{build-artifact-days-to-keep}'
+      artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
-            project: 'dmm'
-        - gerrit-parameter:
-            branch: '{branch}'
-        - os-parameter:
-            os: '{os}'
+      - project-parameter:
+          project: 'dmm'
+      - gerrit-parameter:
+          branch: '{branch}'
+      - os-parameter:
+          os: '{os}'
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: ''
-            choosing-strategy: 'default'
+      - gerrit-trigger-scm:
+          credentials-id: 'jenkins-gerrit-credentials'
+          refspec: ''
+          choosing-strategy: 'default'
 
     wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - fdio-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-patch-merged:
-            name: 'dmm'
-            branch: '{branch}'
+      - gerrit-trigger-patch-merged:
+          name: 'dmm'
+          branch: '{branch}'
 
     builders:
-        - shell:
-            !include-raw-escape: include-raw-build.sh
+      - shell:
+          !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
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    build-discarder:
+      daysToKeep: '{build-days-to-keep}'
+      numToKeep: '{build-num-to-keep}'
+      artifactDaysToKeep: '{build-artifact-days-to-keep}'
+      artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
-            project: 'dmm'
-        - gerrit-parameter:
-            branch: '{branch}'
+      - project-parameter:
+          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:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+      - gerrit-trigger-scm:
+          credentials-id: 'jenkins-gerrit-credentials'
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
 
     wrappers:
-       - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - fdio-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-manually-triggered:
-            name: 'dmm'
-            branch: '{branch}'
-            comment-trigger-value: 'verify-dmm-func'
+      - gerrit-trigger-patch-submitted:
+          name: 'dmm'
+          branch: '{branch}'
 
     builders:
-        - shell:
-            !include-raw-escape: include-raw-dmm-csit-functional-virl.sh
+      - shell:
+          !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
 
-        - robot-report:
-            output-path: 'csit'
-
-        - 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