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 84ed58c..e5337b7 100644 (file)
--- a/jjb/vpp/docs.yaml
+++ b/jjb/vpp/docs.yaml
@@ -2,43 +2,45 @@
 - 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'
     executor-arch: 'x86_64'
-    os: 'ubuntu1804'
 
     stream:
       - master:
           branch: 'master'
-      - '1908':
-          branch: 'stable/1908'
-      - '2001':
-          branch: 'stable/2001'
-      - '2005':
-          branch: 'stable/2005'
+          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'
     executor-arch: 'x86_64'
-    os: 'ubuntu1804'
+    os: 'ubuntu2004'
 
     stream:
       - master:
           branch: 'master'
+          branch-refspec: ''
 
 - job-template:
-    name: 'vpp-docs-verify-{stream}'
+    name: 'vpp-docs-verify-{stream}-{os}-{executor-arch}'
 
     project-type: freestyle
     node: 'builder-{os}-prod-{executor-arch}'
@@ -65,7 +67,8 @@
           maven-version: 'mvn33-new'
       - stream-parameter:
           stream: '{stream}'
-      - gerrit-refspec-parameter
+      - gerrit-refspec-parameter:
+          refspec: '{branch-refspec}'
 
     scm:
       - gerrit-trigger-scm:
@@ -93,6 +96,9 @@
       - provide-maven-settings:
           settings-file: 'vpp-settings'
           global-settings-file: 'global-settings'
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_ubuntu_docker_test.sh
@@ -105,7 +111,7 @@
           maven-version: 'mvn36'
 
 - job-template:
-    name: 'vpp-docs-merge-{stream}'
+    name: 'vpp-docs-merge-{stream}-{os}-{executor-arch}'
 
     project-type: freestyle
     node: 'builder-{os}-prod-{executor-arch}'
@@ -149,7 +155,7 @@
 
     triggers:
       - reverse:
-          jobs: 'vpp-merge-{stream}-ubuntu1804'
+          jobs: 'vpp-merge-{stream}-{os}-{executor-arch}'
           result: 'success'
       - gerrit:
           server-name: 'Primary'
@@ -179,6 +185,9 @@
       - provide-maven-settings:
           settings-file: 'vpp-settings'
           global-settings-file: 'global-settings'
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_ubuntu_docker_test.sh
@@ -191,7 +200,7 @@
           maven-version: 'mvn36'
 
 - job-template:
-    name: 'vpp-sphinx-docs-verify-{stream}'
+    name: 'vpp-sphinx-docs-verify-{stream}-{os}-{executor-arch}'
 
     project-type: freestyle
     node: 'builder-{os}-prod-{executor-arch}'
@@ -218,7 +227,8 @@
           maven-version: 'mvn33-new'
       - stream-parameter:
           stream: '{stream}'
-      - gerrit-refspec-parameter
+      - gerrit-refspec-parameter:
+          refspec: '{branch-refspec}'
 
     scm:
       - gerrit-trigger-scm:
@@ -259,6 +269,9 @@
       - provide-maven-settings:
           settings-file: 'vpp-settings'
           global-settings-file: 'global-settings'
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_ubuntu_docker_test.sh
@@ -271,7 +284,7 @@
           maven-version: 'mvn36'
 
 - job-template:
-    name: 'vpp-sphinx-docs-merge-{stream}'
+    name: 'vpp-sphinx-docs-merge-{stream}-{os}-{executor-arch}'
 
     project-type: freestyle
     node: 'builder-{os}-prod-{executor-arch}'
@@ -337,6 +350,9 @@
       - provide-maven-settings:
           settings-file: 'vpp-settings'
           global-settings-file: 'global-settings'
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_ubuntu_docker_test.sh
@@ -349,7 +365,7 @@
           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: 'builder-{os}-prod-{executor-arch}'
@@ -376,7 +392,8 @@
           maven-version: 'mvn33-new'
       - stream-parameter:
           stream: '{stream}'
-      - gerrit-refspec-parameter
+      - gerrit-refspec-parameter:
+          refspec: '{branch-refspec}'
 
     scm:
       - gerrit-trigger-scm:
@@ -404,6 +421,9 @@
       - provide-maven-settings:
           settings-file: 'vpp-settings'
           global-settings-file: 'global-settings'
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_ubuntu_docker_test.sh
@@ -416,7 +436,7 @@
           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: 'builder-{os}-prod-{executor-arch}'
@@ -461,7 +481,7 @@
 
     triggers:
       - reverse:
-          jobs: 'vpp-merge-{stream}-ubuntu1804'
+          jobs: 'vpp-merge-{stream}-{os}-{executor-arch}'
           result: 'success'
       - gerrit:
           server-name: 'Primary'
@@ -491,6 +511,9 @@
       - provide-maven-settings:
           settings-file: 'vpp-settings'
           global-settings-file: 'global-settings'
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_ubuntu_docker_test.sh