Comment usage of parallel-vars.sh

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

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index fb5af2d..1faaf52 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -7,8 +7,8 @@
 
     project: 'vpp'
     os:
-      - ubuntu1604:
-          repo-os-part: 'ubuntu.xenial.main'
+      - ubuntu1804:
+          repo-os-part: 'ubuntu.bionic.main'
       - centos7:
           repo-os-part: 'centos7'
 
@@ -16,15 +16,15 @@
       - 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'
+      - '2001':
+          branch: 'stable/2001'
+          repo-stream-part: 'stable.2001'
 
 - project:
     name: vpp-clang
@@ -64,7 +64,10 @@
       - '1908':
           branch: 'stable/1908'
           repo-stream-part: 'stable.1908'
-    os: ubuntu1604
+      - '2001':
+          branch: 'stable/2001'
+          repo-stream-part: 'stable.2001'
+    os: ubuntu1804
 
 - project:
     name: vpp-perpatch
@@ -72,7 +75,9 @@
       - 'vpp-csit-verify-device-{stream}-{device-node-arch}'
       - 'vpp-csit-verify-perf-{stream}-{node-arch}'
     project: 'vpp'
-    executor: 'vpp-csit-device'
+    os: ubuntu1804
+    device-executor: 'vpp-csit-device'
+    executor: '{os}-us'
     skip-vote: 'true'
     trigger: 'gerrit-trigger-csit-devicetest-full'
     stream:
@@ -85,31 +90,35 @@
       - '1908':
           branch: 'stable/1908'
           repo-stream-part: 'stable.1908'
-    os: ubuntu1804
+      - '2001':
+          branch: 'stable/2001'
+          repo-stream-part: 'stable.2001'
     device-node-arch:
       - 1n-skx
       - 1n-tx2:
-          executor: 'vpp-csit-arm-ubuntu18'
+          device-executor: 'vpp-csit-arm-ubuntu18'
           trigger: 'gerrit-trigger-csit-devicetest-manual'
     node-arch:
+      - 2n-clx
       - 2n-skx
       - 3n-skx
       - 3n-hsw
+      - 2n-dnv
+      - 3n-dnv
+      - 3n-tsh:
+          executor: 'ubuntu1804arm-s'
     exclude:
       - stream: '1904'
         os: 'ubuntu1804'
         device-node-arch: '1n-tx2'
 
 - project:
-    name: vpp-master-only
+    name: vpp-older-only
     jobs:
-      - 'vpp-beta-verify-{stream}-{os}'
-      - 'vpp-beta-merge-{stream}-{os}'
+      - 'vpp-historic-verify-{stream}-{os}'
+      - 'vpp-historic-merge-{stream}-{os}'
     project: 'vpp'
     stream:
-      - master:
-          branch: 'master'
-          repo-stream-part: 'master'
       - '1901':
           branch: 'stable/1901'
           repo-stream-part: 'stable.1901'
@@ -119,9 +128,12 @@
       - '1908':
           branch: 'stable/1908'
           repo-stream-part: 'stable.1908'
+      - '2001':
+          branch: 'stable/2001'
+          repo-stream-part: 'stable.2001'
     os:
-      - ubuntu1804:
-          repo-os-part: 'ubuntu.bionic.main'
+      - ubuntu1604:
+          repo-os-part: 'ubuntu.xenial.main'
 
 - project:
     name: vpp-arm
@@ -142,6 +154,9 @@
       - '1908':
           branch: 'stable/1908'
           repo-stream-part: 'stable.1908'
+      - '2001':
+          branch: 'stable/2001'
+          repo-stream-part: 'stable.2001'
     os:
       - ubuntu1804:
           repo-os-part: 'ubuntu-arm.bionic.main'
@@ -177,7 +192,7 @@
     project-name: vpp
 
 - job-template:
-    name: 'vpp-beta-verify-{stream}-{os}'
+    name: 'vpp-historic-verify-{stream}-{os}'
 
     project-type: freestyle
     node: '{os}-us'
@@ -223,11 +238,14 @@
 
     builders:
       - 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:
           - ../scripts/setup_vpp_dpdk_dev_env.sh
-          - include-raw-vpp-build.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/vpp/build.sh
 
     publishers:
       - fdio-infra-shiplogs:
@@ -238,7 +256,7 @@
           fixed-delay: 90
 
 - job-template:
-    name: 'vpp-beta-merge-{stream}-{os}'
+    name: 'vpp-historic-merge-{stream}-{os}'
 
     project-type: freestyle
     node: '{os}-us'
@@ -294,11 +312,14 @@
             - file-id: 'packagecloud_api'
               target: '/root'
       - 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:
           - ../scripts/setup_vpp_dpdk_dev_env.sh
-          - include-raw-vpp-build.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/vpp/build.sh
       - provide-maven-settings:
           settings-file: 'vpp-settings'
           global-settings-file: 'global-settings'
@@ -357,12 +378,16 @@
 
     builders:
       - shell:
-          !include-raw-escape: ../scripts/setup_vpp_ubuntu_arm_test.sh
+          !include-raw-escape:
+          - ../scripts/setup_vpp_ubuntu_arm_test.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_dpdk_dev_env.sh
-          - include-raw-vpp-parallel-vars.sh
-          - include-raw-vpp-arm-build.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/vpp/parallel-vars.sh
+          # Do not split, the line below wants env vars from the line above.
+          - ../scripts/vpp/arm-build.sh
 
     publishers:
       - fdio-infra-shiplogs:
@@ -429,12 +454,16 @@
             - file-id: 'packagecloud_api'
               target: '/root'
       - shell:
-          !include-raw-escape: ../scripts/setup_vpp_ubuntu_arm_test.sh
+          !include-raw-escape:
+          - ../scripts/setup_vpp_ubuntu_arm_test.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_dpdk_dev_env.sh
-          - include-raw-vpp-parallel-vars.sh
-          - include-raw-vpp-arm-build-no-test.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/vpp/parallel-vars.sh
+          # Do not split, the line below wants env vars from the line above.
+          - ../scripts/vpp/arm-build-no-test.sh
 
       - provide-maven-settings:
           settings-file: 'vpp-settings'
@@ -469,7 +498,7 @@
       - os-parameter:
           os: '{os}'
       - repo-name-parameter:
-          repo-name: '{repo-stream-part}.ubuntu.xenial.main'
+          repo-name: '{repo-stream-part}.ubuntu.bionic.main'
 
     scm:
       - gerrit-trigger-scm:
@@ -488,7 +517,7 @@
             - patchset-created-event:
                 exclude-drafts: 'true'
                 exclude-trivial-rebase: 'false'
-                exclude-no-code-change: 'true'
+                exclude-no-code-change: 'false'
             - draft-published-event
             - comment-added-contains-event:
                 comment-contains-value: 'checkstylecheck'
@@ -534,11 +563,14 @@
 
     builders:
       - shell:
-          !include-raw-escape: include-raw-vpp-checkstyle.sh
+          !include-raw-escape:
+          - ../scripts/vpp/checkstyle.sh
       - shell:
-          !include-raw-escape: include-raw-vpp-test-checkstyle.sh
+          !include-raw-escape:
+          - ../scripts/vpp/test-checkstyle.sh
       - shell:
-          !include-raw-escape: include-raw-vpp-commitmsg.sh
+          !include-raw-escape:
+          - ../scripts/vpp/commitmsg.sh
 
     publishers:
       - fdio-infra-shiplogs:
@@ -595,11 +627,14 @@
 
     builders:
       - 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:
           - ../scripts/setup_vpp_dpdk_dev_env.sh
-          - include-raw-vpp-build.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/vpp/build.sh
 
     publishers:
       - fdio-infra-shiplogs:
@@ -629,7 +664,7 @@
       - gerrit-parameter:
           branch: '{branch}'
       - os-parameter:
-          os: 'ubuntu1604'
+          os: 'ubuntu1804'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.ubuntu.bionic.main'
       - stream-parameter:
@@ -652,11 +687,14 @@
 
     builders:
       - 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:
           - ../scripts/setup_vpp_dpdk_dev_env.sh
-          - include-raw-vpp-clang-build.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/vpp/clang-build.sh
 
     publishers:
       - fdio-infra-shiplogs:
@@ -707,7 +745,7 @@
 
     builders:
       - shell:
-          command: !include-raw-escape: include-raw-vpp-coverity.sh
+          command: !include-raw-escape: ../scripts/vpp/coverity.sh
           unstable-return: 42
 
     publishers:
@@ -822,13 +860,17 @@
             - file-id: 'packagecloud_api'
               target: '/root'
       - shell:
-          !include-raw-escape: include-raw-vpp-checkstyle.sh
+          !include-raw-escape:
+          - ../scripts/vpp/checkstyle.sh
       - 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:
           - ../scripts/setup_vpp_dpdk_dev_env.sh
-          - include-raw-vpp-build.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/vpp/build.sh
       - provide-maven-settings:
           settings-file: 'vpp-settings'
           global-settings-file: 'global-settings'
@@ -846,9 +888,16 @@
 
 - job-template:
     name: 'vpp-csit-verify-device-{stream}-{device-node-arch}'
+    description: |
+      <ul>
+          <li>executor
+              <ul>
+                  <li>{device-executor}
+              </ul>
+      </ul>
 
     project-type: freestyle
-    node: '{executor}'
+    node: '{device-executor}'
     concurrent: true
     archive-artifacts: '**/csit_current/**/*.*'
     latest-only: false
@@ -897,13 +946,14 @@
 
     builders:
       - 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: ../scripts/setup_vpp_dpdk_dev_env.sh
+          !include-raw-escape:
+          - ../scripts/setup_vpp_dpdk_dev_env.sh
       - shell:
           !include-raw-escape:
-            - include-raw-vpp-parallel-vars.sh
-            - include-raw-vpp-csit-device.sh
+          - ../scripts/vpp/csit-device.sh
 
     publishers:
       - robot-report:
@@ -914,9 +964,16 @@
 
 - job-template:
     name: 'vpp-csit-verify-perf-{stream}-{node-arch}'
+    description: |
+      <ul>
+          <li>executor
+              <ul>
+                  <li>{executor}
+              </ul>
+      </ul>
 
     project-type: freestyle
-    node: '{os}-us'
+    node: '{executor}'
     concurrent: true
     archive-artifacts: >
       **/csit_current/**/*.*
@@ -942,14 +999,10 @@
       - gerrit-event-type-parameter
       - gerrit-event-comment-text-parameter
       - gerrit-csit-refspec-parameter
-      - string:
-          name: CSIT_PERF_TRIAL_DURATION
-          default: "10.0"
-          description: "Duration of a trial measurement in BMRR tests."
-      - string:
-          name: CSIT_PERF_TRIAL_MULTIPLICITY
-          default: "5"
-          description: "Number of subsamples for BMRR tests."
+      - csit-perf-trial-duration-parameter:
+          csit-perf-trial-duration: "10.0"
+      - csit-perf-trial-multiplicity-parameter:
+          csit-perf-trial-multiplicity: "5"
       - stream-parameter:
           stream: '{stream}'
       - string:
@@ -975,11 +1028,14 @@
 
     builders:
       - 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: ../scripts/setup_vpp_dpdk_dev_env.sh
+          !include-raw-escape:
+          - ../scripts/setup_vpp_dpdk_dev_env.sh
       - shell:
-          !include-raw-escape: include-raw-vpp-csit-perf.sh
+          !include-raw-escape:
+          - ../scripts/vpp/csit-perf.sh
 
     publishers:
       - robot-report:
@@ -1040,9 +1096,11 @@
 
     builders:
       - 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: check_crc.sh
+          !include-raw-escape:
+          - ../scripts/vpp/check_crc.sh
       # TODO: Add sending e-mail notifications to vpp-api-dev@lists.fd.io
 
     publishers: