From c7be6720402a80b8af7459b0e1e0efe85b1f3b8b Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Date: Wed, 21 Oct 2020 13:46:00 +0200
Subject: unify build scripts in HPCAI jobs

Their build scripts lacked cleaning workspace, handling docker config.

Change-Id: I88b5e271727ecfa40b1ea876c7ad086de0b096d3
---
 ldcg-python-pytorch-vision/build-containers.sh | 3 ++-
 ldcg-python-pytorch-vision/build.sh            | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'ldcg-python-pytorch-vision')

diff --git a/ldcg-python-pytorch-vision/build-containers.sh b/ldcg-python-pytorch-vision/build-containers.sh
index 11c1c23b27..716ecc623e 100644
--- a/ldcg-python-pytorch-vision/build-containers.sh
+++ b/ldcg-python-pytorch-vision/build-containers.sh
@@ -7,13 +7,14 @@ trap cleanup_exit EXIT INT TERM ERR
 cleanup_exit()
 {
     rm -rf ${HOME}/.docker
-    rm -rf ${WORKSPACE}
 }
 
 mkdir -p ${HOME}/.docker
 sed -e "s|\${DOCKER_AUTH}|${DOCKER_AUTH}|" < ${WORKSPACE}/config.json > ${HOME}/.docker/config.json
 chmod 0600 ${HOME}/.docker/config.json
 
+rm -rf ${WORKSPACE}
+
 git clone --depth 1 https://git.linaro.org/ci/job/configs.git
 
 cd configs/ldcg-python-pytorch-vision/
diff --git a/ldcg-python-pytorch-vision/build.sh b/ldcg-python-pytorch-vision/build.sh
index eed89a6aab..0bce9611c9 100644
--- a/ldcg-python-pytorch-vision/build.sh
+++ b/ldcg-python-pytorch-vision/build.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+set -xe
+
+rm -rf ${WORKSPACE}/*
+
 if [ -e /etc/debian_version ]; then
     echo "deb http://deb.debian.org/debian/ buster-backports main" | sudo tee /etc/apt/sources.list.d/backports.list
     sudo apt update
-- 
cgit v1.2.3