Merge "Modify logs publisher"

[ci-management.git] / jjb / tldk / tldk.yaml

diff --git a/jjb/tldk/tldk.yaml b/jjb/tldk/tldk.yaml
index 7cdbe1c..5380ce9 100644 (file)
--- a/jjb/tldk/tldk.yaml
+++ b/jjb/tldk/tldk.yaml
@@ -37,7 +37,7 @@
     name: '{project}-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-builder-4c-4g'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     build-discarder:
@@ -78,14 +78,13 @@
           !include-raw-escape: include-raw-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: '{project}-verify-image-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-builder-4c-4g'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     build-discarder:
@@ -139,14 +138,13 @@
           !include-raw-escape: include-raw-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: '{project}-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-builder-4c-4g'
+    node: '{os}-basebuild-4c-4g'
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
       numToKeep: '{build-num-to-keep}'
@@ -185,15 +183,19 @@
           !include-raw-escape: include-raw-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'tldk-csit-verify-func-{stream}-{os}-virl'
 
     project-type: freestyle
-    node: '{os}-builder-4c-4g'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
+    archive-artifacts: >
+      **/csit/report.html
+      **/csit/log.html
+      **/csit/output.xml
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -206,6 +208,10 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -228,15 +234,15 @@
           !include-raw-escape: include-raw-tldk-csit-functional-virl.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: >
-            **/csit/report.html,
-            **/csit/log.html,
-            **/csit/output.xml
-          latest-only: false
-
       - robot-report:
           output-path: ''
+      - lf-infra-publish
 
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+- project:
+    name: tldk-info
+    project-name: tldk
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-4c-4g
+    project: tldk
+    branch: master