From: Vratko Polak Date: Tue, 7 Jan 2020 17:01:18 +0000 (+0100) Subject: VPP: Make script inclusion more readable X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=c16cf4ec132c21090342324878ca22ad1fc0476e;p=ci-management.git VPP: Make script inclusion more readable Historically, scripts names started with include-raw-vpp- prefix. That was not only long and superfluous, but also confusing, as the actual way of including uses "include-raw-escape", which is a command behaving differently than "include-raw", suggested by the previous name. This Change shortens script names to the part that actually says something about the script. + Delete include-gcc8-prefer.sh as it is orphaned since https://gerrit.fd.io/r/c/ci-management/+/20443 + Move the scripts to jjb/scripts/vpp/. - "absolute" paths are not used, as ci-man root is not in search path. + Put each path on a separate line to avoid long lines. + Put each include in a separate shell to make sure return code of each script is checked. + Update copyright year where present. - Copyright notices are not added when not present. Change-Id: I48920542ff20810cc87fb01844236350348bae59 Signed-off-by: Vratko Polak --- diff --git a/jjb/vpp/include-raw-vpp-arm-build-no-test.sh b/jjb/scripts/vpp/arm-build-no-test.sh similarity index 100% rename from jjb/vpp/include-raw-vpp-arm-build-no-test.sh rename to 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 similarity index 100% rename from jjb/vpp/include-raw-vpp-arm-build.sh rename to jjb/scripts/vpp/arm-build.sh diff --git a/jjb/vpp/include-raw-vpp-build.sh b/jjb/scripts/vpp/build.sh similarity index 100% rename from jjb/vpp/include-raw-vpp-build.sh rename to jjb/scripts/vpp/build.sh diff --git a/jjb/vpp/check_crc.sh b/jjb/scripts/vpp/check_crc.sh similarity index 96% rename from jjb/vpp/check_crc.sh rename to 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 similarity index 100% rename from jjb/vpp/include-raw-vpp-checkstyle.sh rename to jjb/scripts/vpp/checkstyle.sh diff --git a/jjb/vpp/include-raw-vpp-clang-build.sh b/jjb/scripts/vpp/clang-build.sh similarity index 100% rename from jjb/vpp/include-raw-vpp-clang-build.sh rename to jjb/scripts/vpp/clang-build.sh diff --git a/jjb/vpp/include-raw-vpp-commitmsg.sh b/jjb/scripts/vpp/commitmsg.sh similarity index 100% rename from jjb/vpp/include-raw-vpp-commitmsg.sh rename to jjb/scripts/vpp/commitmsg.sh diff --git a/jjb/vpp/include-raw-vpp-coverity.sh b/jjb/scripts/vpp/coverity.sh similarity index 100% rename from jjb/vpp/include-raw-vpp-coverity.sh rename to jjb/scripts/vpp/coverity.sh diff --git a/jjb/vpp/include-raw-vpp-csit-device.sh b/jjb/scripts/vpp/csit-device.sh similarity index 96% rename from jjb/vpp/include-raw-vpp-csit-device.sh rename to 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 similarity index 96% rename from jjb/vpp/include-raw-vpp-csit-perf.sh rename to 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 similarity index 100% rename from jjb/vpp/include-raw-vpp-docs.sh rename to 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 similarity index 100% rename from jjb/vpp/include-raw-vpp-make-test-docs.sh rename to 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 similarity index 100% rename from jjb/vpp/include-raw-vpp-maven-push.sh rename to jjb/scripts/vpp/maven-push.sh diff --git a/jjb/vpp/include-raw-vpp-parallel-vars.sh b/jjb/scripts/vpp/parallel-vars.sh similarity index 100% rename from jjb/vpp/include-raw-vpp-parallel-vars.sh rename to jjb/scripts/vpp/parallel-vars.sh diff --git a/jjb/vpp/include-raw-vpp-sphinx-docs.sh b/jjb/scripts/vpp/sphinx-docs.sh similarity index 100% rename from jjb/vpp/include-raw-vpp-sphinx-docs.sh rename to jjb/scripts/vpp/sphinx-docs.sh diff --git a/jjb/vpp/include-raw-vpp-test-checkstyle.sh b/jjb/scripts/vpp/test-checkstyle.sh similarity index 100% rename from jjb/vpp/include-raw-vpp-test-checkstyle.sh rename to jjb/scripts/vpp/test-checkstyle.sh diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml index 7c1b61fe3..c34387e8f 100644 --- a/jjb/vpp/docs.yaml +++ b/jjb/vpp/docs.yaml @@ -106,9 +106,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 @@ -194,9 +196,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 @@ -273,9 +277,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 @@ -352,9 +358,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 @@ -419,9 +427,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 @@ -508,9 +518,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 4f81c6cd6..163d655e8 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -223,11 +223,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: @@ -294,11 +297,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 +363,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: @@ -429,12 +440,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' @@ -534,11 +550,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 +614,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: @@ -652,11 +674,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 +732,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 +847,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' @@ -904,13 +933,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: @@ -985,11 +1018,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: @@ -1050,9 +1086,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: