Modify docs jobs to use global-jjb macro for logs

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

diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml
index 2416e42..23f1b93 100644 (file)
--- a/jjb/vpp/docs.yaml
+++ b/jjb/vpp/docs.yaml
@@ -22,6 +22,9 @@
       - '1904':
           branch: 'stable/1904'
           repo-stream-part: 'stable.1904'
+      - '1908':
+          branch: 'stable/1908'
+          repo-stream-part: 'stable.1908'
 
     type:
       - short
@@ -42,9 +45,6 @@
       - master:
           branch: 'master'
           repo-stream-part: 'master'
-      - '1810':
-          branch: 'stable/1810'
-          repo-stream-part: 'stable.1810'
     type:
       - short
       - long
@@ -55,7 +55,6 @@
     project-type: freestyle
     node: ubuntu1604-us
     concurrent: true
-    archive-artifacts: '**/build-root/docs/html/*'
     allow-empty: 'true'
     fingerprint: false
     only-if-success: true
@@ -79,10 +78,6 @@
           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:
@@ -116,12 +111,11 @@
           !include-raw-escape: include-raw-vpp-docs.sh
 
     publishers:
-        - 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: 'vpp-docs-merge-{stream}'
@@ -205,8 +199,7 @@
           !include-raw-escape: include-raw-vpp-docs.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1
@@ -218,7 +211,6 @@
     project-type: freestyle
     node: ubuntu1604-us
     concurrent: true
-    archive-artifacts: '**/build-root/docs/html/*'
     allow-empty: 'true'
     fingerprint: false
     only-if-success: true
@@ -241,10 +233,6 @@
           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:
@@ -290,12 +278,11 @@
           !include-raw-escape: include-raw-vpp-sphinx-docs.sh
 
     publishers:
-        - 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: 'vpp-sphinx-docs-merge-{stream}'
@@ -303,7 +290,7 @@
     project-type: freestyle
     node: ubuntu1604-us
     concurrent: false
-    archive-artifacts: '**/build-root/docs/html/*'
+    archive-artifacts: 'docs/_build/html/*'
     allow-empty: 'true'
     fingerprint: false
     only-if-success: true
@@ -370,12 +357,11 @@
           !include-raw-escape: include-raw-vpp-sphinx-docs.sh
 
     publishers:
-        - 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: 'vpp-make-test-docs-verify-{stream}'
@@ -383,7 +369,6 @@
     project-type: freestyle
     node: ubuntu1604-us
     concurrent: true
-    archive-artifacts: '**/test/doc/build/html/*'
     allow-empty: 'true'
     fingerprint: false
     only-if-success: true
@@ -406,10 +391,6 @@
           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:
@@ -443,8 +424,7 @@
           !include-raw-escape: include-raw-vpp-make-test-docs.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1
@@ -533,8 +513,7 @@
           !include-raw-escape: include-raw-vpp-make-test-docs.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1