diff options
| author |   Vratko Polak <vrpolak@cisco.com> | 2020-01-15 14:15:46 +0100 |
|---|---|---|
| committer | Vratko Polak <vrpolak@cisco.com> | 2020-01-15 14:15:46 +0100 |
| commit | ca6e551324a6ed11f92b1635a89f3c37d75e2305 (patch) | |
| tree | a2920569663663585ee305a7bdb8c29fba20ba84 | |
| parent | 10bb972eb35f76910e15374217154ddd12e1e147 (diff) | |
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 <vrpolak@cisco.com>
| -rw-r--r-- | jjb/scripts/vpp/arm-build-no-test.sh | 6 | ||||
| -rw-r--r-- | jjb/scripts/vpp/arm-build.sh | 6 | ||||
| -rw-r--r-- | 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: @@ -951,9 +953,6 @@ - ../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 publishers: |