lkft: fix error for the change of build directory

Change-Id: Ia768bca5447d57bc675160a8af9e5b31504972d7
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

3 files changed, 24 insertions, 21 deletions

diff --git a/lkft/common/builders-v2.sh b/lkft/common/builders-v2.sh
index 284ceb3e..4a8d9822 100755
--- a/lkft/common/builders-v2.sh
+++ b/lkft/common/builders-v2.sh
@@ -21,24 +21,27 @@ pip install --user --force-reinstall ruamel.yaml
 sudo apt-get update
 sudo apt-get install -y selinux-utils cpio
 
-export LKFT_WORK_DIR=/home/buildslave/srv/${BUILD_DIR}
-export LKFT_BUILD_DIR=/home/buildslave/srv/${BUILD_DIR}/workspace
+export LKFT_WORK_ROOT_DIR=/home/buildslave/srv/${BUILD_DIR}
+# NOTE: LKFT_WORK_DIR used by linaro-lkft.sh as well
+export LKFT_WORK_DIR=${LKFT_WORK_ROOT_DIR}/workspace
 
-# temporary workaround for changing to build under ${LKFT_BUILD_DIR}
-if [ -d "${LKFT_WORK_DIR}/.repo" ]; then
-  sudo rm -fr ${LKFT_WORK_DIR}
+# temporary workaround for changing to build under ${LKFT_WORK_DIR}
+if [ -d "${LKFT_WORK_ROOT_DIR}/.repo" ]; then
+  sudo rm -fr ${LKFT_WORK_ROOT_DIR}
 fi
-if [ ! -d "${LKFT_WORK_DIR}" ]; then
-  sudo mkdir -p ${LKFT_WORK_DIR}
-  sudo chmod 777 ${LKFT_WORK_DIR}
+if [ ! -d "${LKFT_WORK_ROOT_DIR}" ]; then
+  sudo mkdir -p ${LKFT_WORK_ROOT_DIR}
+  sudo chmod 777 ${LKFT_WORK_ROOT_DIR}
 fi
-cd ${LKFT_WORK_DIR}
+cd ${LKFT_WORK_ROOT_DIR}
 
 # clean the workspace, but keep using the old repo for repo sync speed
-LKFT_REPO_BACKUP=${LKFT_WORK_DIR_DIR}/.repo-lkft
-rm -fr ${LKFT_REPO_BACKUP} && [ -d ${LKFT_BUILD_DIR}/.repo ] && mv ${LKFT_BUILD_DIR}/.repo ${LKFT_REPO_BACKUP}
-rm -fr ${LKFT_BUILD_DIR} && mkdir -p ${LKFT_BUILD_DIR} && [ -d ${LKFT_REPO_BACKUP} ] && mv ${LKFT_REPO_BACKUP} ${LKFT_BUILD_DIR}/.repo
-cd ${LKFT_BUILD_DIR}
+LKFT_REPO_BACKUP=${LKFT_WORK_ROOT_DIR}/.repo-lkft
+LKFT_REPO_UNDER_WORK_DIR=${LKFT_WORK_DIR}/.repo
+rm -fr ${LKFT_REPO_BACKUP} && [ -d ${LKFT_REPO_UNDER_WORK_DIR} ] && mv ${LKFT_REPO_UNDER_WORK_DIR} ${LKFT_REPO_BACKUP}
+rm -fr ${LKFT_WORK_DIR} && mkdir -p ${LKFT_WORK_DIR} && [ -d ${LKFT_REPO_BACKUP} ] && mv ${LKFT_REPO_BACKUP} ${LKFT_REPO_UNDER_WORK_DIR}
+
+cd ${LKFT_WORK_DIR}
 
 wget https://android-git.linaro.org/android-build-configs.git/plain/lkft/linaro-lkft.sh?h=lkft -O linaro-lkft.sh
 chmod +x linaro-lkft.sh
diff --git a/lkft/common/publisher-v2.sh b/lkft/common/publisher-v2.sh
index 4a7f7bfc..4342b8d7 100644
--- a/lkft/common/publisher-v2.sh
+++ b/lkft/common/publisher-v2.sh
@@ -1,9 +1,9 @@
 #!/bin/bash -ex
 
-echo "For Test purpose check 1: LKFT_BUILD_DIR=${LKFT_BUILD_DIR}"
-export LKFT_BUILD_DIR=/home/buildslave/srv/${BUILD_DIR}/workspace
-echo "For Test purpose check 2: LKFT_BUILD_DIR=${LKFT_BUILD_DIR}"
-cd ${LKFT_BUILD_DIR}
+echo "For Test purpose check 1: LKFT_WORK_DIR=${LKFT_WORK_DIR}"
+export LKFT_WORK_DIR=/home/buildslave/srv/${BUILD_DIR}/workspace
+echo "For Test purpose check 2: LKFT_WORK_DIR=${LKFT_WORK_DIR}"
+cd ${LKFT_WORK_DIR}
 
 JOB_OUT_PUBLISH=out/publish
 rm -fr ${JOB_OUT_PUBLISH} && mkdir -p ${JOB_OUT_PUBLISH}
diff --git a/lkft/lava-job-definitions/common/submit_for_testing-v2.sh b/lkft/lava-job-definitions/common/submit_for_testing-v2.sh
index 8a01053b..b2f7f0f8 100755
--- a/lkft/lava-job-definitions/common/submit_for_testing-v2.sh
+++ b/lkft/lava-job-definitions/common/submit_for_testing-v2.sh
@@ -1,9 +1,9 @@
 #!/bin/bash -ex
 
-echo "For Test purpose check 1: LKFT_BUILD_DIR=${LKFT_BUILD_DIR}"
-export LKFT_BUILD_DIR=/home/buildslave/srv/${BUILD_DIR}/workspace
-echo "For Test purpose check 2: LKFT_BUILD_DIR=${LKFT_BUILD_DIR}"
-cd ${LKFT_BUILD_DIR}
+echo "For Test purpose check 1: LKFT_WORK_DIR=${LKFT_WORK_DIR}"
+export LKFT_WORK_DIR=/home/buildslave/srv/${BUILD_DIR}/workspace
+echo "For Test purpose check 2: LKFT_WORK_DIR=${LKFT_WORK_DIR}"
+cd ${LKFT_WORK_DIR}
 
 F_ABS_PATH=$(readlink -e $0)
 OPT_DRY_RUN=""