From c16cf4ec132c21090342324878ca22ad1fc0476e Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Tue, 7 Jan 2020 18:01:18 +0100 Subject: 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 --- jjb/vpp/docs.yaml | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) (limited to 'jjb/vpp/docs.yaml') 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 -- cgit 1.2.3-korg