Code Review
/
ci-management.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Modify logs publisher"
[ci-management.git]
/
jjb
/
dmm
/
dmm.yaml
diff --git
a/jjb/dmm/dmm.yaml
b/jjb/dmm/dmm.yaml
index
2667db0
..
274f6a4
100644
(file)
--- 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-verify-{stream}-checkstyle'
- 'dmm-verify-{stream}-{os}'
- 'dmm-merge-{stream}-{os}'
- - 'dmm-csit-verify-func-master-{os}-virl'
project: 'dmm'
os: 'ubuntu1604'
project: 'dmm'
os: 'ubuntu1604'
@@
-31,6
+30,22
@@
branch: 'master'
- non-dpdk:
branch: 'none-dpdk'
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
- project:
name: dmm-view
@@
-79,8
+94,7
@@
!include-raw-escape: include-raw-dmm-test-checkstyle.sh
publishers:
!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}'
- job-template:
name: 'dmm-verify-{stream}-{os}'
@@
-123,8
+137,7
@@
!include-raw-escape: include-raw-build.sh
publishers:
!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}'
- job-template:
name: 'dmm-merge-{stream}-{os}'
@@
-165,15
+178,16
@@
!include-raw-escape: include-raw-build.sh
publishers:
!include-raw-escape: include-raw-build.sh
publishers:
- - fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ - lf-infra-publish
- job-template:
- job-template:
- name: 'dmm-csit-verify-func-
master
-{os}-virl'
+ name: 'dmm-csit-verify-func-
{stream}
-{os}-virl'
project-type: freestyle
node: '{os}-builder-4c-4g'
concurrent: true
project-type: freestyle
node: '{os}-builder-4c-4g'
concurrent: true
+ archive-artifacts: 'csit/archive/*.*'
+ latest-only: false
build-discarder:
daysToKeep: '{build-days-to-keep}'
build-discarder:
daysToKeep: '{build-days-to-keep}'
@@
-186,6
+200,10
@@
project: 'dmm'
- gerrit-parameter:
branch: '{branch}'
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:
scm:
- gerrit-trigger-scm:
@@
-207,12
+225,15
@@
!include-raw-escape: include-raw-dmm-csit-functional-virl.sh
publishers:
!include-raw-escape: include-raw-dmm-csit-functional-virl.sh
publishers:
- - archive-artifacts:
- artifacts: 'csit/archive/*.*'
- latest-only: false
-
- robot-report:
output-path: 'csit'
- 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