Merge "VPP: Make script inclusion more readable"

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

diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml
index aa4b18e..f5ba7ee 100644 (file)
--- a/jjb/vpp/docs.yaml
+++ b/jjb/vpp/docs.yaml
@@ -9,8 +9,8 @@
 
     project: 'vpp'
     os:
-      - ubuntu1604:
-          repo-os-part: 'ubuntu.xenial.main'
+      - ubuntu1804:
+          repo-os-part: 'ubuntu.bionic.main'
 
     stream:
       - master:
@@ -22,6 +22,13 @@
       - '1904':
           branch: 'stable/1904'
           repo-stream-part: 'stable.1904'
+      - '1908':
+          branch: 'stable/1908'
+          repo-stream-part: 'stable.1908'
+      - '2001':
+          branch: 'stable/2001'
+          repo-stream-part: 'stable.2001'
+
     type:
       - short
       - long
@@ -34,16 +41,13 @@
 
     project: 'vpp'
     os:
-      - ubuntu1604:
-          repo-os-part: 'ubuntu.xenial.main'
+      - ubuntu1804:
+          repo-os-part: 'ubuntu.bionic.main'
 
     stream:
       - master:
           branch: 'master'
           repo-stream-part: 'master'
-      - '1810':
-          branch: 'stable/1810'
-          repo-stream-part: 'stable.1810'
     type:
       - short
       - long
@@ -52,8 +56,13 @@
     name: 'vpp-docs-verify-{stream}'
 
     project-type: freestyle
-    node: ubuntu1604-us
+    node: ubuntu1804-us
     concurrent: true
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
+
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -67,7 +76,7 @@
       - gerrit-parameter:
           branch: '{branch}'
       - os-parameter:
-          os: 'ubuntu1604'
+          os: 'ubuntu1804'
       - maven-exec:
           maven-version: 'mvn33-new'
       - stream-parameter:
@@ -100,30 +109,31 @@
           settings-file: 'vpp-settings'
           global-settings-file: 'global-settings'
       - shell:
-          !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
+          !include-raw-escape:
+          - ../scripts/setup_vpp_ubuntu_docker_test.sh
       - shell:
-          !include-raw-escape: include-raw-vpp-docs.sh
+          !include-raw-escape:
+          - ../scripts/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:
-            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}'
 
     project-type: freestyle
-    node: ubuntu1604-us
+    node: ubuntu1804-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}'
@@ -137,11 +147,14 @@
       - gerrit-parameter:
           branch: '{branch}'
       - os-parameter:
-          os: 'ubuntu1604'
+          os: 'ubuntu1804'
       - maven-exec:
           maven-version: 'mvn33-new'
       - stream-parameter:
           stream: '{stream}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -155,7 +168,7 @@
 
     triggers:
       - reverse:
-          jobs: 'vpp-merge-{stream}-ubuntu1604'
+          jobs: 'vpp-merge-{stream}-ubuntu1804'
           result: 'success'
       - gerrit:
           server-name: 'Primary'
@@ -186,19 +199,14 @@
           settings-file: 'vpp-settings'
           global-settings-file: 'global-settings'
       - shell:
-          !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
+          !include-raw-escape:
+          - ../scripts/setup_vpp_ubuntu_docker_test.sh
       - shell:
-          !include-raw-escape: include-raw-vpp-docs.sh
+          !include-raw-escape:
+          - ../scripts/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'
+      - lf-infra-publish
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1
@@ -208,8 +216,12 @@
     name: 'vpp-sphinx-docs-verify-{stream}'
 
     project-type: freestyle
-    node: ubuntu1604-us
+    node: ubuntu1804-us
     concurrent: true
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -223,7 +235,7 @@
       - gerrit-parameter:
           branch: '{branch}'
       - os-parameter:
-          os: 'ubuntu1604'
+          os: 'ubuntu1804'
       - maven-exec:
           maven-version: 'mvn33-new'
       - stream-parameter:
@@ -268,30 +280,30 @@
           settings-file: 'vpp-settings'
           global-settings-file: 'global-settings'
       - shell:
-          !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
+          !include-raw-escape:
+          - ../scripts/setup_vpp_ubuntu_docker_test.sh
       - shell:
-          !include-raw-escape: include-raw-vpp-sphinx-docs.sh
+          !include-raw-escape:
+          - ../scripts/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:
-            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}'
 
     project-type: freestyle
-    node: ubuntu1604-us
+    node: ubuntu1804-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}'
@@ -305,11 +317,15 @@
       - gerrit-parameter:
           branch: '{branch}'
       - os-parameter:
-          os: 'ubuntu1604'
+          os: 'ubuntu1804'
       - maven-exec:
           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:
@@ -345,30 +361,29 @@
           settings-file: 'vpp-settings'
           global-settings-file: 'global-settings'
       - shell:
-          !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
+          !include-raw-escape:
+          - ../scripts/setup_vpp_ubuntu_docker_test.sh
       - shell:
-          !include-raw-escape: include-raw-vpp-sphinx-docs.sh
+          !include-raw-escape:
+          - ../scripts/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:
-            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}'
 
     project-type: freestyle
-    node: ubuntu1604-us
+    node: ubuntu1804-us
     concurrent: true
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -382,7 +397,7 @@
       - gerrit-parameter:
           branch: '{branch}'
       - os-parameter:
-          os: 'ubuntu1604'
+          os: 'ubuntu1804'
       - maven-exec:
           maven-version: 'mvn33-new'
       - stream-parameter:
@@ -415,19 +430,14 @@
           settings-file: 'vpp-settings'
           global-settings-file: 'global-settings'
       - shell:
-          !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
+          !include-raw-escape:
+          - ../scripts/setup_vpp_ubuntu_docker_test.sh
       - shell:
-          !include-raw-escape: include-raw-vpp-make-test-docs.sh
+          !include-raw-escape:
+          - ../scripts/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'
+      - lf-infra-publish
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1
@@ -437,8 +447,14 @@
     name: 'vpp-make-test-docs-merge-{stream}'
 
     project-type: freestyle
-    node: ubuntu1604-us
+    node: ubuntu1804-us
     concurrent: false
+    archive-artifacts: '**/build-root/build-test/doc/html/*'
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
+
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -452,11 +468,15 @@
       - gerrit-parameter:
           branch: '{branch}'
       - os-parameter:
-          os: 'ubuntu1604'
+          os: 'ubuntu1804'
       - maven-exec:
           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:
@@ -470,7 +490,7 @@
 
     triggers:
       - reverse:
-          jobs: 'vpp-merge-{stream}-ubuntu1604'
+          jobs: 'vpp-merge-{stream}-ubuntu1804'
           result: 'success'
       - gerrit:
           server-name: 'Primary'
@@ -501,19 +521,14 @@
           settings-file: 'vpp-settings'
           global-settings-file: 'global-settings'
       - shell:
-          !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
+          !include-raw-escape:
+          - ../scripts/setup_vpp_ubuntu_docker_test.sh
       - shell:
-          !include-raw-escape: include-raw-vpp-make-test-docs.sh
+          !include-raw-escape:
+          - ../scripts/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'
+      - lf-infra-publish
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1