X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fdocs.yaml;h=4a7952fafbfc7b08ccadb3348e102e397d843e83;hb=9b2f5ae435e06fb70262e48852f54e7dc29b08cb;hp=f478b1db26a1c2acc0e6dd096b56c234ac975629;hpb=5d6957213db905668370f4cd292f97f843c784c4;p=ci-management.git

diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml
index f478b1db2..4a7952faf 100644
--- a/jjb/vpp/docs.yaml
+++ b/jjb/vpp/docs.yaml
@@ -16,21 +16,13 @@
       - master:
           branch: 'master'
           repo-stream-part: 'master'
-      - '1801':
-          branch: 'stable/1801'
-          repo-stream-part: 'stable.1801'
-      - '1804':
-          branch: 'stable/1804'
-          repo-stream-part: 'stable.1804'
-      - '1807':
-          branch: 'stable/1807'
-          repo-stream-part: 'stable.1807'
-      - '1810':
-          branch: 'stable/1810'
-          repo-stream-part: 'stable.1810'
       - '1901':
           branch: 'stable/1901'
           repo-stream-part: 'stable.1901'
+      - '1904':
+          branch: 'stable/1904'
+          repo-stream-part: 'stable.1904'
+
     type:
       - short
       - long
@@ -63,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}'
@@ -93,7 +90,7 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - gerrit-trigger-checkstyle:
+      - gerrit-trigger-checkstyle-nonvoting:
           name: '{project}'
           branch: '{branch}'
 
@@ -114,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:
@@ -133,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}'
@@ -151,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:
@@ -200,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:
@@ -219,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}'
@@ -282,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:
@@ -301,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}'
@@ -319,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:
@@ -359,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:
@@ -378,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}'
@@ -429,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:
@@ -448,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}'
@@ -466,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:
@@ -515,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: