Merge "VPP: Make script inclusion more readable"

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

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index d08823d..8d2c84c 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -238,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:
@@ -309,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'
@@ -372,12 +378,17 @@
 
     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
+      - shell:
+          !include-raw-escape:
+          - ../scripts/vpp/arm-build.sh
 
     publishers:
       - fdio-infra-shiplogs:
@@ -444,12 +455,17 @@
             - 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
+      - shell:
+          !include-raw-escape:
+          - ../scripts/vpp/arm-build-no-test.sh
 
       - provide-maven-settings:
           settings-file: 'vpp-settings'
@@ -549,11 +565,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:
@@ -610,11 +629,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:
@@ -667,11 +689,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:
@@ -722,7 +747,7 @@
 
     builders:
       - shell:
-          command: !include-raw-escape: include-raw-vpp-coverity.sh
+          command: !include-raw-escape: ../scripts/vpp/coverity.sh
           unstable-return: 42
 
     publishers:
@@ -837,13 +862,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'
@@ -919,13 +948,17 @@
 
     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
       - shell:
-          !include-raw-escape: ../scripts/setup_vpp_dpdk_dev_env.sh
+          !include-raw-escape:
+          - ../scripts/vpp/parallel-vars.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:
@@ -1000,11 +1033,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:
@@ -1065,9 +1101,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: