From ca6e551324a6ed11f92b1635a89f3c37d75e2305 Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Wed, 15 Jan 2020 14:15:46 +0100 Subject: [PATCH] Comment usage of parallel-vars.sh + Add comments to scripts that need the values. + Add comments to shell stanzas to not split inclusions. + Remove parallel-vars.sh from a job that does not use the values. - It seems compilation time is not affected by the values. Change-Id: If844486411753fcac7bece1db8416f2d23ea3749 Signed-off-by: Vratko Polak --- jjb/scripts/vpp/arm-build-no-test.sh | 6 ++++++ jjb/scripts/vpp/arm-build.sh | 6 ++++++ jjb/vpp/vpp.yaml | 5 ++--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/jjb/scripts/vpp/arm-build-no-test.sh b/jjb/scripts/vpp/arm-build-no-test.sh index 94cc82449..ae5aa34d3 100644 --- a/jjb/scripts/vpp/arm-build-no-test.sh +++ b/jjb/scripts/vpp/arm-build-no-test.sh @@ -1,4 +1,10 @@ #!/bin/bash + +# This script wants environment variables +# set by parallel-vars.sh script. +# Otherwise "make test" is not parallelized, +# possibly leading to jobs overstepping their time limit. + # basic build script example set -xe -o pipefail diff --git a/jjb/scripts/vpp/arm-build.sh b/jjb/scripts/vpp/arm-build.sh index 9de736ae0..2abe6105d 100644 --- a/jjb/scripts/vpp/arm-build.sh +++ b/jjb/scripts/vpp/arm-build.sh @@ -1,4 +1,10 @@ #!/bin/bash + +# This script wants environment variables +# set by parallel-vars.sh script. +# Otherwise "make test" is not parallelized, +# possibly leading to jobs overstepping their time limit. + # basic build script example set -xe -o pipefail diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 08fcf3c93..1faaf5208 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -386,6 +386,7 @@ - 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: @@ -461,6 +462,7 @@ - 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: @@ -949,9 +951,6 @@ - shell: !include-raw-escape: - ../scripts/setup_vpp_dpdk_dev_env.sh - - shell: - !include-raw-escape: - - ../scripts/vpp/parallel-vars.sh - shell: !include-raw-escape: - ../scripts/vpp/csit-device.sh -- 2.16.6