ci: Fix default retry script usage #18798

pull hebasto wants to merge 1 commits into bitcoin:master from hebasto:200428-ci-retry changing 2 files +2 −1

hebasto commented at 8:25 AM on April 28, 2020: member

On master (5352d14b3796d9e672a20ada8f7613a70fe448f4) CI_RETRY_EXE=${CI_RETRY_EXE:retry} works as a Substring Expansion, and that is wrong. If CI_RETRY_EXE variable was unset initially, its new value becomes an empty string, but not "retry" as one could expect. Consequently, the ${CI_RETRY_EXE} ... command does not use ci/retry/retry script.

This PR makes for CI_RETRY_EXE variable a usual parameter expansion, i.e., ${parameter:-word}.

Reference: #18735 (comment)
ci: Fix default retry script usage 45615de26c
fanquake added the label Tests on Apr 28, 2020
in ci/test/04_install.sh:61 in 45615de26c
```
  57 | @@ -58,6 +58,7 @@ else
  58 |      bash -c "export PATH=$BASE_SCRATCH_DIR/bins/:\$PATH && cd $P_CI_DIR && $*"
  59 |    }
  60 |  fi
  61 | +export -f DOCKER_EXEC
```
MarcoFalke commented at 11:01 AM on April 28, 2020:

This part I don't understand. It was working "correctly" before (without retry).
hebasto commented at 3:21 PM on April 28, 2020:

Besides Bash Reference Manual, there are more references:

https://unix.stackexchange.com/questions/22796/can-i-export-functions-in-bash

https://stackoverflow.com/questions/1885871/exporting-a-function-in-shell

If shell function retry is used, it runs a subshell, and cannot see definitions of other shell functions unless they are exported: "Functions may be exported so that subshells automatically have them defined with the -f option to the export builtin." (from Bash Reference Manual).

This could be verified by set -x.
MarcoFalke closed this on Apr 28, 2020
MarcoFalke reopened this on Apr 28, 2020
hebasto commented at 3:23 PM on April 28, 2020: member

The example of the fixed usage of the retry script: https://cirrus-ci.com/task/5531561323921408
MarcoFalke merged this on Apr 29, 2020
MarcoFalke closed this on Apr 29, 2020
sidhujag referenced this in commit 07691a241c on Apr 29, 2020
hebasto deleted the branch on Apr 29, 2020
DrahtBot locked this on Feb 15, 2022

Contributors

hebasto

MarcoFalke

Labels

Tests

Linked (view graph)

#18735 ci: Add and document BASE_BUILD_DIR