From: Dave Wallace <dwallacelf@gmail.com>
Date: Tue, 13 Apr 2021 18:40:23 +0000 (-0400)
Subject: builder: if new ansible dir doesn't exist, use old one.
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=adbd1055136dc970fd02c2dadbe7af1a55727bc2;p=ci-management.git

builder: if new ansible dir doesn't exist, use old one.

Change-Id: I539fc3981b46a285bf6934d2dd13c8c660fc0e8a
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
---

diff --git a/docker/scripts/lib_csit.sh b/docker/scripts/lib_csit.sh
index 221c1edb2..6c064d0a8 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"