From 45615de26caa4c8ffeacc558143aaf6887cbb314 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Tue, 28 Apr 2020 10:07:25 +0300
Subject: [PATCH] ci: Fix default retry script usage

---
 ci/test/00_setup_env.sh | 2 +-
 ci/test/04_install.sh   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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"