X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fdmm%2Fdmm.yaml;h=76c1a448b03678af096d1923e407ab763d28fad6;hb=075ded3718f03d6ad3c3eb23685f06ed6cc8673b;hp=b8cef656b424bc510b4480c5acfe81159f39b6f8;hpb=0375cd7bf5fa3d004ba1da0de5175aba34440ae7;p=ci-management.git diff --git a/jjb/dmm/dmm.yaml b/jjb/dmm/dmm.yaml index b8cef656b..76c1a448b 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,6 +30,22 @@ 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 @@ -42,7 +57,7 @@ name: 'dmm-verify-{stream}-checkstyle' project-type: freestyle - node: '{os}-basebuild-4c-4g' + node: '{os}-builder-4c-4g' concurrent: true build-discarder: @@ -86,7 +101,7 @@ name: 'dmm-verify-{stream}-{os}' project-type: freestyle - node: '{os}-basebuild-4c-4g' + node: '{os}-builder-4c-4g' concurrent: true build-discarder: @@ -130,7 +145,7 @@ 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}' @@ -169,10 +184,10 @@ maven-version: 'mvn33-new' - job-template: - name: 'dmm-csit-verify-func-master-{os}-virl' + name: 'dmm-csit-verify-func-{stream}-{os}-virl' project-type: freestyle - node: '{os}-basebuild-4c-4g' + node: '{os}-builder-4c-4g' concurrent: true build-discarder: @@ -216,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