summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVanessa Rene Valderrama <vvalderrama@linuxfoundation.org>2021-04-15 16:53:42 +0000
committerGerrit Code Review <gerrit@fd.io>2021-04-15 16:53:42 +0000
commitd8a0b87898170273bb76930c636edfe691354484 (patch)
tree15d9f4113aeb047e8dd88e276eb03dc680cf0677
parent30b033e8cb93cd62fc909ead82be4f4a77e5a25b (diff)
parentadbd1055136dc970fd02c2dadbe7af1a55727bc2 (diff)
Merge "builder: if new ansible dir doesn't exist, use old one."
-rw-r--r--docker/scripts/lib_csit.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/docker/scripts/lib_csit.sh b/docker/scripts/lib_csit.sh
index 221c1edb..6c064d0a 100644
--- a/docker/scripts/lib_csit.sh
+++ b/docker/scripts/lib_csit.sh
@@ -63,6 +63,9 @@ csit_install_packages() {
local branchname="$(echo $branch | sed -e 's,/,_,')"
local csit_dir="$DOCKER_CSIT_DIR"
local csit_ansible_dir="$csit_dir/fdio.infra.ansible"
+ if [ ! -d "$csit_ansible_dir" ] ; then
+ csit_ansible_dir="$csit_dir/resources/tools/testbed-setup/ansible"
+ fi
local bld_log="$DOCKER_BUILD_LOG_DIR/$FDIOTOOLS_IMAGENAME"
bld_log="${bld_log}-$branchname-csit_install_packages-bld.log"