diff options
author | Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org> | 2020-01-13 13:02:05 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@fd.io> | 2020-01-13 13:02:05 +0000 |
commit | 2d5ae82547d5b18d098eda9beccfde19b7e70e61 (patch) | |
tree | f52e4136dd922d72a2c692d50ab3b861f9651777 /jjb | |
parent | 286f72aebc5babfc6afd1c249b26a5015fc7a3fc (diff) | |
parent | c16cf4ec132c21090342324878ca22ad1fc0476e (diff) |
Merge "VPP: Make script inclusion more readable"
Diffstat (limited to 'jjb')
-rw-r--r-- | jjb/scripts/vpp/arm-build-no-test.sh (renamed from jjb/vpp/include-raw-vpp-arm-build-no-test.sh) | 0 | ||||
-rw-r--r-- | jjb/scripts/vpp/arm-build.sh (renamed from jjb/vpp/include-raw-vpp-arm-build.sh) | 0 | ||||
-rw-r--r-- | jjb/scripts/vpp/build.sh (renamed from jjb/vpp/include-raw-vpp-build.sh) | 0 | ||||
-rw-r--r-- | jjb/scripts/vpp/check_crc.sh (renamed from jjb/vpp/check_crc.sh) | 2 | ||||
-rw-r--r-- | jjb/scripts/vpp/checkstyle.sh (renamed from jjb/vpp/include-raw-vpp-checkstyle.sh) | 0 | ||||
-rw-r--r-- | jjb/scripts/vpp/clang-build.sh (renamed from jjb/vpp/include-raw-vpp-clang-build.sh) | 0 | ||||
-rw-r--r-- | jjb/scripts/vpp/commitmsg.sh (renamed from jjb/vpp/include-raw-vpp-commitmsg.sh) | 0 | ||||
-rw-r--r-- | jjb/scripts/vpp/coverity.sh (renamed from jjb/vpp/include-raw-vpp-coverity.sh) | 0 | ||||
-rw-r--r-- | jjb/scripts/vpp/csit-device.sh (renamed from jjb/vpp/include-raw-vpp-csit-device.sh) | 2 | ||||
-rw-r--r-- | jjb/scripts/vpp/csit-perf.sh (renamed from jjb/vpp/include-raw-vpp-csit-perf.sh) | 2 | ||||
-rw-r--r-- | jjb/scripts/vpp/docs.sh (renamed from jjb/vpp/include-raw-vpp-docs.sh) | 0 | ||||
-rw-r--r-- | jjb/scripts/vpp/make-test-docs.sh (renamed from jjb/vpp/include-raw-vpp-make-test-docs.sh) | 0 | ||||
-rw-r--r-- | jjb/scripts/vpp/maven-push.sh (renamed from jjb/vpp/include-raw-vpp-maven-push.sh) | 0 | ||||
-rw-r--r-- | jjb/scripts/vpp/parallel-vars.sh (renamed from jjb/vpp/include-raw-vpp-parallel-vars.sh) | 0 | ||||
-rw-r--r-- | jjb/scripts/vpp/sphinx-docs.sh (renamed from jjb/vpp/include-raw-vpp-sphinx-docs.sh) | 0 | ||||
-rw-r--r-- | jjb/scripts/vpp/test-checkstyle.sh (renamed from jjb/vpp/include-raw-vpp-test-checkstyle.sh) | 0 | ||||
-rw-r--r-- | jjb/vpp/docs.yaml | 36 | ||||
-rw-r--r-- | jjb/vpp/include-gcc8-prefer.sh | 2 | ||||
-rw-r--r-- | jjb/vpp/vpp.yaml | 98 |
19 files changed, 95 insertions, 47 deletions
diff --git a/jjb/vpp/include-raw-vpp-arm-build-no-test.sh b/jjb/scripts/vpp/arm-build-no-test.sh index 94cc82449..94cc82449 100644 --- a/jjb/vpp/include-raw-vpp-arm-build-no-test.sh +++ b/jjb/scripts/vpp/arm-build-no-test.sh diff --git a/jjb/vpp/include-raw-vpp-arm-build.sh b/jjb/scripts/vpp/arm-build.sh index 9de736ae0..9de736ae0 100644 --- a/jjb/vpp/include-raw-vpp-arm-build.sh +++ b/jjb/scripts/vpp/arm-build.sh diff --git a/jjb/vpp/include-raw-vpp-build.sh b/jjb/scripts/vpp/build.sh index 6fdaec133..6fdaec133 100644 --- a/jjb/vpp/include-raw-vpp-build.sh +++ b/jjb/scripts/vpp/build.sh diff --git a/jjb/vpp/check_crc.sh b/jjb/scripts/vpp/check_crc.sh index 71d960ace..04e53966d 100644 --- a/jjb/vpp/check_crc.sh +++ b/jjb/scripts/vpp/check_crc.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2019 Cisco and/or its affiliates. +# Copyright (c) 2020 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: diff --git a/jjb/vpp/include-raw-vpp-checkstyle.sh b/jjb/scripts/vpp/checkstyle.sh index 7c520dd99..7c520dd99 100644 --- a/jjb/vpp/include-raw-vpp-checkstyle.sh +++ b/jjb/scripts/vpp/checkstyle.sh diff --git a/jjb/vpp/include-raw-vpp-clang-build.sh b/jjb/scripts/vpp/clang-build.sh index b1bed417b..b1bed417b 100644 --- a/jjb/vpp/include-raw-vpp-clang-build.sh +++ b/jjb/scripts/vpp/clang-build.sh diff --git a/jjb/vpp/include-raw-vpp-commitmsg.sh b/jjb/scripts/vpp/commitmsg.sh index d926ff5dd..d926ff5dd 100644 --- a/jjb/vpp/include-raw-vpp-commitmsg.sh +++ b/jjb/scripts/vpp/commitmsg.sh diff --git a/jjb/vpp/include-raw-vpp-coverity.sh b/jjb/scripts/vpp/coverity.sh index 47a316a89..47a316a89 100644 --- a/jjb/vpp/include-raw-vpp-coverity.sh +++ b/jjb/scripts/vpp/coverity.sh diff --git a/jjb/vpp/include-raw-vpp-csit-device.sh b/jjb/scripts/vpp/csit-device.sh index 87be53f06..af54c9dc4 100644 --- a/jjb/vpp/include-raw-vpp-csit-device.sh +++ b/jjb/scripts/vpp/csit-device.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2019 Cisco and/or its affiliates. +# Copyright (c) 2020 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: diff --git a/jjb/vpp/include-raw-vpp-csit-perf.sh b/jjb/scripts/vpp/csit-perf.sh index f37d8e720..17a9d39bc 100644 --- a/jjb/vpp/include-raw-vpp-csit-perf.sh +++ b/jjb/scripts/vpp/csit-perf.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2018 Cisco and/or its affiliates. +# Copyright (c) 2020 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: diff --git a/jjb/vpp/include-raw-vpp-docs.sh b/jjb/scripts/vpp/docs.sh index 608f8f979..608f8f979 100644 --- a/jjb/vpp/include-raw-vpp-docs.sh +++ b/jjb/scripts/vpp/docs.sh diff --git a/jjb/vpp/include-raw-vpp-make-test-docs.sh b/jjb/scripts/vpp/make-test-docs.sh index 1f82ab502..1f82ab502 100644 --- a/jjb/vpp/include-raw-vpp-make-test-docs.sh +++ b/jjb/scripts/vpp/make-test-docs.sh diff --git a/jjb/vpp/include-raw-vpp-maven-push.sh b/jjb/scripts/vpp/maven-push.sh index 6ce3b2c06..6ce3b2c06 100644 --- a/jjb/vpp/include-raw-vpp-maven-push.sh +++ b/jjb/scripts/vpp/maven-push.sh diff --git a/jjb/vpp/include-raw-vpp-parallel-vars.sh b/jjb/scripts/vpp/parallel-vars.sh index 1a5de149f..1a5de149f 100644 --- a/jjb/vpp/include-raw-vpp-parallel-vars.sh +++ b/jjb/scripts/vpp/parallel-vars.sh diff --git a/jjb/vpp/include-raw-vpp-sphinx-docs.sh b/jjb/scripts/vpp/sphinx-docs.sh index e5b8cfd15..e5b8cfd15 100644 --- a/jjb/vpp/include-raw-vpp-sphinx-docs.sh +++ b/jjb/scripts/vpp/sphinx-docs.sh diff --git a/jjb/vpp/include-raw-vpp-test-checkstyle.sh b/jjb/scripts/vpp/test-checkstyle.sh index bdc843114..bdc843114 100644 --- a/jjb/vpp/include-raw-vpp-test-checkstyle.sh +++ b/jjb/scripts/vpp/test-checkstyle.sh diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml index 2e5e33ff4..f5ba7ee12 100644 --- a/jjb/vpp/docs.yaml +++ b/jjb/vpp/docs.yaml @@ -109,9 +109,11 @@ 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: - lf-infra-publish @@ -197,9 +199,11 @@ 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: - lf-infra-publish @@ -276,9 +280,11 @@ 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: - lf-infra-publish @@ -355,9 +361,11 @@ 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: - lf-infra-publish @@ -422,9 +430,11 @@ 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: - lf-infra-publish @@ -511,9 +521,11 @@ 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: - lf-infra-publish diff --git a/jjb/vpp/include-gcc8-prefer.sh b/jjb/vpp/include-gcc8-prefer.sh deleted file mode 100644 index 6de4beb40..000000000 --- a/jjb/vpp/include-gcc8-prefer.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 700 --slave /usr/bin/g++ g++ /usr/bin/g++-7 && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8 diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index d08823d04..8d2c84c57 100644 --- 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: |