Merge "Modify logs publisher"

[ci-management.git] / jjb / hicn / hicn-docs.yaml

diff --git a/jjb/hicn/hicn-docs.yaml b/jjb/hicn/hicn-docs.yaml
index 437596b..efd15f6 100644 (file)
--- a/jjb/hicn/hicn-docs.yaml
+++ b/jjb/hicn/hicn-docs.yaml
@@ -1,3 +1,4 @@
+---
 - project:
     name: hicn-docs
     jobs:
@@ -23,6 +24,11 @@
     project-type: freestyle
     node: ubuntu1604-us
     concurrent: true
+    archive-artifacts: '**/build/lib/doc/html/*'
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -41,6 +47,10 @@
           maven-version: 'mvn33-new'
       - stream-parameter:
           stream: '{stream}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -61,7 +71,7 @@
       - maven-target:
           maven-version: 'mvn33-new'
           goals: '--version'
-          settings: 'vpp-settings'
+          settings: 'hicn-settings'
           settings-type: cfp
           global-settings: 'global-settings'
           global-settings-type: cfp
@@ -72,18 +82,11 @@
           !include-raw-escape: include-raw-hicn-docs.sh
 
     publishers:
-        - archive:
-            artifacts: 'build/lib/doc/html/*'
-            allow-empty: 'true'
-            fingerprint: false
-            only-if-success: true
-            default-excludes: false
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
-        - naginator:
-            rerun-unstable-builds: false
-            max-failed-builds: 1
-            fixed-delay: 90
+      - lf-infra-publish
+      - naginator:
+          rerun-unstable-builds: false
+          max-failed-builds: 1
+          fixed-delay: 90
 
 - job-template:
     name: 'hicn-docs-merge-{stream}'
@@ -91,6 +94,11 @@
     project-type: freestyle
     node: ubuntu1604-us
     concurrent: false
+    archive-artifacts: '**/build/lib/doc/html/*'
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -109,6 +117,10 @@
           maven-version: 'mvn33-new'
       - stream-parameter:
           stream: '{stream}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -145,7 +157,7 @@
       - maven-target:
           maven-version: 'mvn33-new'
           goals: '--version'
-          settings: 'vpp-settings'
+          settings: 'hicn-settings'
           settings-type: cfp
           global-settings: 'global-settings'
           global-settings-type: cfp
@@ -156,14 +168,7 @@
           !include-raw-escape: include-raw-hicn-docs.sh
 
     publishers:
-      - archive:
-          artifacts: 'build/lib/doc/html/*'
-          allow-empty: 'true'
-          fingerprint: false
-          only-if-success: true
-          default-excludes: false
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1