Merge "Update sandbox bash functions"

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

diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml
index 23f1b93..e5337b7 100644 (file)
--- a/jjb/vpp/docs.yaml
+++ b/jjb/vpp/docs.yaml
@@ -2,65 +2,54 @@
 - project:
     name: docs
     jobs:
-      - 'vpp-docs-merge-{stream}'
-      - 'vpp-docs-verify-{stream}'
-      - 'vpp-make-test-docs-merge-{stream}'
-      - 'vpp-make-test-docs-verify-{stream}'
+      - 'vpp-docs-merge-{stream}-{os}-{executor-arch}'
+      - 'vpp-docs-verify-{stream}-{os}-{executor-arch}'
+      - 'vpp-make-test-docs-merge-{stream}-{os}-{executor-arch}'
+      - 'vpp-make-test-docs-verify-{stream}-{os}-{executor-arch}'
 
     project: 'vpp'
-    os:
-      - ubuntu1604:
-          repo-os-part: 'ubuntu.xenial.main'
+    executor-arch: 'x86_64'
 
     stream:
       - master:
           branch: 'master'
-          repo-stream-part: 'master'
-      - '1901':
-          branch: 'stable/1901'
-          repo-stream-part: 'stable.1901'
-      - '1904':
-          branch: 'stable/1904'
-          repo-stream-part: 'stable.1904'
-      - '1908':
-          branch: 'stable/1908'
-          repo-stream-part: 'stable.1908'
-
-    type:
-      - short
-      - long
+          branch-refspec: ''
+          os: 'ubuntu2004'
+      - '2009':
+          branch: 'stable/2009'
+          branch-refspec: ''
+          os: 'ubuntu1804'
+      - '2101':
+          branch: 'stable/2101'
+          branch-refspec: ''
+          os: 'ubuntu1804'
 
 - project:
     name: sphinx
     jobs:
-      - 'vpp-sphinx-docs-merge-{stream}'
-      - 'vpp-sphinx-docs-verify-{stream}'
+      - 'vpp-sphinx-docs-merge-{stream}-{os}-{executor-arch}'
+      - 'vpp-sphinx-docs-verify-{stream}-{os}-{executor-arch}'
 
     project: 'vpp'
-    os:
-      - ubuntu1604:
-          repo-os-part: 'ubuntu.xenial.main'
+    executor-arch: 'x86_64'
+    os: 'ubuntu2004'
 
     stream:
       - master:
           branch: 'master'
-          repo-stream-part: 'master'
-    type:
-      - short
-      - long
+          branch-refspec: ''
 
 - job-template:
-    name: 'vpp-docs-verify-{stream}'
+    name: 'vpp-docs-verify-{stream}-{os}-{executor-arch}'
 
     project-type: freestyle
-    node: ubuntu1604-us
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: true
     allow-empty: 'true'
     fingerprint: false
     only-if-success: true
     default-excludes: false
 
-
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
       numToKeep: '{build-num-to-keep}'
@@ -73,11 +62,13 @@
       - gerrit-parameter:
           branch: '{branch}'
       - os-parameter:
-          os: 'ubuntu1604'
+          os: '{os}'
       - maven-exec:
           maven-version: 'mvn33-new'
       - stream-parameter:
           stream: '{stream}'
+      - gerrit-refspec-parameter:
+          refspec: '{branch-refspec}'
 
     scm:
       - gerrit-trigger-scm:
@@ -106,22 +97,24 @@
           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_executor_env.sh
+      - shell:
+          !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:
-      - lf-infra-publish
-      - naginator:
-          rerun-unstable-builds: false
-          max-failed-builds: 1
-          fixed-delay: 90
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn36'
 
 - job-template:
-    name: 'vpp-docs-merge-{stream}'
+    name: 'vpp-docs-merge-{stream}-{os}-{executor-arch}'
 
     project-type: freestyle
-    node: ubuntu1604-us
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: false
     archive-artifacts: '**/build-root/docs/html/*'
     allow-empty: 'true'
@@ -129,7 +122,6 @@
     only-if-success: true
     default-excludes: false
 
-
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
       numToKeep: '{build-num-to-keep}'
@@ -142,7 +134,7 @@
       - gerrit-parameter:
           branch: '{branch}'
       - os-parameter:
-          os: 'ubuntu1604'
+          os: '{os}'
       - maven-exec:
           maven-version: 'mvn33-new'
       - stream-parameter:
@@ -163,7 +155,7 @@
 
     triggers:
       - reverse:
-          jobs: 'vpp-merge-{stream}-ubuntu1604'
+          jobs: 'vpp-merge-{stream}-{os}-{executor-arch}'
           result: 'success'
       - gerrit:
           server-name: 'Primary'
@@ -194,22 +186,24 @@
           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_executor_env.sh
       - shell:
-          !include-raw-escape: include-raw-vpp-docs.sh
+          !include-raw-escape:
+          - ../scripts/setup_vpp_ubuntu_docker_test.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/vpp/docs.sh
 
     publishers:
-      - lf-infra-publish
-      - naginator:
-          rerun-unstable-builds: false
-          max-failed-builds: 1
-          fixed-delay: 90
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn36'
 
 - job-template:
-    name: 'vpp-sphinx-docs-verify-{stream}'
+    name: 'vpp-sphinx-docs-verify-{stream}-{os}-{executor-arch}'
 
     project-type: freestyle
-    node: ubuntu1604-us
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: true
     allow-empty: 'true'
     fingerprint: false
@@ -228,11 +222,13 @@
       - gerrit-parameter:
           branch: '{branch}'
       - os-parameter:
-          os: 'ubuntu1604'
+          os: '{os}'
       - maven-exec:
           maven-version: 'mvn33-new'
       - stream-parameter:
           stream: '{stream}'
+      - gerrit-refspec-parameter:
+          refspec: '{branch-refspec}'
 
     scm:
       - gerrit-trigger-scm:
@@ -261,6 +257,7 @@
             failed: true
             unstable: true
             notbuilt: true
+
     builders:
       - maven-target:
           maven-version: 'mvn33-new'
@@ -273,22 +270,24 @@
           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_executor_env.sh
       - shell:
-          !include-raw-escape: include-raw-vpp-sphinx-docs.sh
+          !include-raw-escape:
+          - ../scripts/setup_vpp_ubuntu_docker_test.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/vpp/sphinx-docs.sh
 
     publishers:
-      - lf-infra-publish
-      - naginator:
-          rerun-unstable-builds: false
-          max-failed-builds: 1
-          fixed-delay: 90
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn36'
 
 - job-template:
-    name: 'vpp-sphinx-docs-merge-{stream}'
+    name: 'vpp-sphinx-docs-merge-{stream}-{os}-{executor-arch}'
 
     project-type: freestyle
-    node: ubuntu1604-us
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: false
     archive-artifacts: 'docs/_build/html/*'
     allow-empty: 'true'
@@ -308,7 +307,7 @@
       - gerrit-parameter:
           branch: '{branch}'
       - os-parameter:
-          os: 'ubuntu1604'
+          os: '{os}'
       - maven-exec:
           maven-version: 'mvn33-new'
       - stream-parameter:
@@ -352,22 +351,24 @@
           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_executor_env.sh
+      - shell:
+          !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:
-      - lf-infra-publish
-      - naginator:
-          rerun-unstable-builds: false
-          max-failed-builds: 1
-          fixed-delay: 90
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn36'
 
 - job-template:
-    name: 'vpp-make-test-docs-verify-{stream}'
+    name: 'vpp-make-test-docs-verify-{stream}-{os}-{executor-arch}'
 
     project-type: freestyle
-    node: ubuntu1604-us
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: true
     allow-empty: 'true'
     fingerprint: false
@@ -386,11 +387,13 @@
       - gerrit-parameter:
           branch: '{branch}'
       - os-parameter:
-          os: 'ubuntu1604'
+          os: '{os}'
       - maven-exec:
           maven-version: 'mvn33-new'
       - stream-parameter:
           stream: '{stream}'
+      - gerrit-refspec-parameter:
+          refspec: '{branch-refspec}'
 
     scm:
       - gerrit-trigger-scm:
@@ -419,30 +422,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_executor_env.sh
+      - shell:
+          !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:
-      - lf-infra-publish
-      - naginator:
-          rerun-unstable-builds: false
-          max-failed-builds: 1
-          fixed-delay: 90
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn36'
 
 - job-template:
-    name: 'vpp-make-test-docs-merge-{stream}'
+    name: 'vpp-make-test-docs-merge-{stream}-{os}-{executor-arch}'
 
     project-type: freestyle
-    node: ubuntu1604-us
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: false
-    archive-artifacts: '**/test/doc/build/html/*'
+    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}'
       numToKeep: '{build-num-to-keep}'
@@ -455,7 +459,7 @@
       - gerrit-parameter:
           branch: '{branch}'
       - os-parameter:
-          os: 'ubuntu1604'
+          os: '{os}'
       - maven-exec:
           maven-version: 'mvn33-new'
       - stream-parameter:
@@ -477,7 +481,7 @@
 
     triggers:
       - reverse:
-          jobs: 'vpp-merge-{stream}-ubuntu1604'
+          jobs: 'vpp-merge-{stream}-{os}-{executor-arch}'
           result: 'success'
       - gerrit:
           server-name: 'Primary'
@@ -508,13 +512,15 @@
           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_executor_env.sh
+      - shell:
+          !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:
-      - lf-infra-publish
-      - naginator:
-          rerun-unstable-builds: false
-          max-failed-builds: 1
-          fixed-delay: 90
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn36'