Merge "Add INFO.yaml verify job"

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

diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml
index aa4b18e..6b1e4e6 100644 (file)
--- a/jjb/vpp/docs.yaml
+++ b/jjb/vpp/docs.yaml
@@ -22,6 +22,7 @@
       - '1904':
           branch: 'stable/1904'
           repo-stream-part: 'stable.1904'
+
     type:
       - short
       - long
@@ -54,6 +55,11 @@
     project-type: freestyle
     node: ubuntu1604-us
     concurrent: true
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
+
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -105,12 +111,6 @@
           !include-raw-escape: include-raw-vpp-docs.sh
 
     publishers:
-        - archive:
-            artifacts: 'docs/_build/html/*'
-            allow-empty: 'true'
-            fingerprint: false
-            only-if-success: true
-            default-excludes: false
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
         - naginator:
@@ -124,6 +124,12 @@
     project-type: freestyle
     node: ubuntu1604-us
     concurrent: false
+    archive-artifacts: '**/build-root/docs/html/*'
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
+
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -142,6 +148,9 @@
           maven-version: 'mvn33-new'
       - stream-parameter:
           stream: '{stream}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -191,12 +200,6 @@
           !include-raw-escape: include-raw-vpp-docs.sh
 
     publishers:
-      - archive:
-          artifacts: 'build-root/docs/html/*'
-          allow-empty: 'true'
-          fingerprint: false
-          only-if-success: true
-          default-excludes: false
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
       - naginator:
@@ -210,6 +213,10 @@
     project-type: freestyle
     node: ubuntu1604-us
     concurrent: true
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -273,12 +280,6 @@
           !include-raw-escape: include-raw-vpp-sphinx-docs.sh
 
     publishers:
-        - archive:
-            artifacts: 'docs/_build/html/*'
-            allow-empty: 'true'
-            fingerprint: false
-            only-if-success: true
-            default-excludes: false
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
         - naginator:
@@ -292,6 +293,11 @@
     project-type: freestyle
     node: ubuntu1604-us
     concurrent: false
+    archive-artifacts: 'docs/_build/html/*'
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -310,6 +316,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:
@@ -350,12 +360,6 @@
           !include-raw-escape: include-raw-vpp-sphinx-docs.sh
 
     publishers:
-        - archive:
-            artifacts: 'docs/_build/html/*'
-            allow-empty: 'true'
-            fingerprint: false
-            only-if-success: true
-            default-excludes: false
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
         - naginator:
@@ -369,6 +373,10 @@
     project-type: freestyle
     node: ubuntu1604-us
     concurrent: true
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -420,12 +428,6 @@
           !include-raw-escape: include-raw-vpp-make-test-docs.sh
 
     publishers:
-      - archive:
-          artifacts: 'build-root/test-doc/build/html/*'
-          allow-empty: 'true'
-          fingerprint: false
-          only-if-success: true
-          default-excludes: false
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
       - naginator:
@@ -439,6 +441,12 @@
     project-type: freestyle
     node: ubuntu1604-us
     concurrent: false
+    archive-artifacts: '**/test/doc/build/html/*'
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
+
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -457,6 +465,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:
@@ -506,12 +518,6 @@
           !include-raw-escape: include-raw-vpp-make-test-docs.sh
 
     publishers:
-      - archive:
-          artifacts: 'build-root/test-doc/build/html/*'
-          allow-empty: 'true'
-          fingerprint: false
-          only-if-success: true
-          default-excludes: false
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
       - naginator: