ci: Fix default retry script usage

hebasto · hebasto · commit 45615de26caa · 2020-04-28T10:52:31.000+03:00
diff --git 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
@@ -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"

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ else`
`58`	`58`	`bash -c "export PATH=$BASE_SCRATCH_DIR/bins/:\$PATH && cd $P_CI_DIR && $*"`
`59`	`59`	`}`
`60`	`60`	`fi`
	`61`	`+export -f DOCKER_EXEC`
`61`	`62`
`62`	`63`	`if [ -n "$DPKG_ADD_ARCH" ]; then`
`63`	`64`	`DOCKER_EXEC dpkg --add-architecture "$DPKG_ADD_ARCH"`