diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2020-04-28 10:07:25 +0300 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2020-04-28 10:52:31 +0300 |
| commit | 45615de26caa4c8ffeacc558143aaf6887cbb314 (patch) | |
| tree | 836be39d6ea6459009c3a6efb2b83b829ca4aa0c /ci | |
| parent | 5352d14b3796d9e672a20ada8f7613a70fe448f4 (diff) | |
ci: Fix default retry script usage
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/test/00_setup_env.sh | 2 | ||||
| -rwxr-xr-x | ci/test/04_install.sh | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ci/test/00_setup_env.sh b/ci/test/00_setup_env.sh index e0e555bbd1..ef6d616e5f 100755 --- a/ci/test/00_setup_env.sh +++ b/ci/test/00_setup_env.sh @@ -57,4 +57,4 @@ export DOCKER_PACKAGES=${DOCKER_PACKAGES:-build-essential libtool autotools-dev export GOAL=${GOAL:-install} export DIR_QA_ASSETS=${DIR_QA_ASSETS:-${BASE_SCRATCH_DIR}/qa-assets} export PATH=${BASE_ROOT_DIR}/ci/retry:$PATH -export CI_RETRY_EXE=${CI_RETRY_EXE:retry} +export CI_RETRY_EXE=${CI_RETRY_EXE:-"retry --"} diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh index 32eaaf15bb..d672b87e8d 100755 --- a/ci/test/04_install.sh +++ b/ci/test/04_install.sh @@ -58,6 +58,7 @@ else bash -c "export PATH=$BASE_SCRATCH_DIR/bins/:\$PATH && cd $P_CI_DIR && $*" } fi +export -f DOCKER_EXEC if [ -n "$DPKG_ADD_ARCH" ]; then DOCKER_EXEC dpkg --add-architecture "$DPKG_ADD_ARCH" |