tcwg-abe-test*: clean abe-tests before cloning
Change-Id: Id6116076cf89f896b3f65e75482816adfedb84d6
diff --git a/tcwg-abe-extended/builders.sh b/tcwg-abe-extended/builders.sh
index 2a3f184..2a1c61f 100755
--- a/tcwg-abe-extended/builders.sh
+++ b/tcwg-abe-extended/builders.sh
@@ -88,11 +88,11 @@
${BUILD_SHELL} -c "set -ex; ./configure; make check" || ret=$?
;;
abe-tests-checkout)
- ${BUILD_SHELL} -c "set -ex; git clone https://gitlab.com/Linaro/tcwg/abe-tests.git; cd abe-tests; ./test-checkout.sh --clean-snapshots --abe-path `pwd` --ref-snapshots /home/tcwg-buildslave/snapshots-ref" || ret=$?
+ ${BUILD_SHELL} -c "set -ex; rm -rf abe-tests ; git clone https://gitlab.com/Linaro/tcwg/abe-tests.git; cd abe-tests; ./test-checkout.sh --clean-snapshots --abe-path `pwd` --ref-snapshots /home/tcwg-buildslave/snapshots-ref" || ret=$?
;;
abe-tests-*)
target=$(echo ${testname} | sed 's/abe-tests-//')
- ${BUILD_SHELL} -c "set -ex; git clone https://gitlab.com/Linaro/tcwg/abe-tests.git; cd abe-tests; ./test-manifest2.sh --abe-path `pwd` --ref-snapshots /home/tcwg-buildslave/snapshots-ref --quiet --display-report --target ${target}" || ret=$?
+ ${BUILD_SHELL} -c "set -ex; rm -rf abe-tests ; git clone https://gitlab.com/Linaro/tcwg/abe-tests.git; cd abe-tests; ./test-manifest2.sh --abe-path `pwd` --ref-snapshots /home/tcwg-buildslave/snapshots-ref --quiet --display-report --target ${target}" || ret=$?
;;
esac
diff --git a/tcwg-abe-test.yaml b/tcwg-abe-test.yaml
index 2023d6e..c531f6c 100644
--- a/tcwg-abe-test.yaml
+++ b/tcwg-abe-test.yaml
@@ -141,7 +141,7 @@
status=$?
;;
abe-tests)
- ${BUILD_SHELL} -c "set -ex; git clone https://gitlab.com/Linaro/tcwg/abe-tests.git; cd abe-tests; ./test-manifest2.sh --abe-path `pwd` --ref-snapshots /home/tcwg-buildslave/snapshots-ref --quiet --display-summary" || status=$?
+ ${BUILD_SHELL} -c "set -ex; rm -rf abe-tests; git clone https://gitlab.com/Linaro/tcwg/abe-tests.git; cd abe-tests; ./test-manifest2.sh --abe-path `pwd` --ref-snapshots /home/tcwg-buildslave/snapshots-ref --quiet --display-summary" || status=$?
$DRYRUNCMD cp abe-tests/full-manifest-test/*.txt ${ARTIFACTS}
$DRYRUNCMD rm ${ARTIFACTS}/empty.txt
# full build logs are large, and not very useful, so we
@@ -149,7 +149,7 @@
$DRYRUNCMD rm -f ${ARTIFACTS}/test-mani-build[12].txt
;;
abe-tests-checkout)
- ${BUILD_SHELL} -c "set -ex; git clone https://gitlab.com/Linaro/tcwg/abe-tests.git; cd abe-tests; ./test-checkout.sh --clean-snapshots --abe-path `pwd` --ref-snapshots /home/tcwg-buildslave/snapshots-ref" || status=$?
+ ${BUILD_SHELL} -c "set -ex; rm -rf abe-tests; git clone https://gitlab.com/Linaro/tcwg/abe-tests.git; cd abe-tests; ./test-checkout.sh --clean-snapshots --abe-path `pwd` --ref-snapshots /home/tcwg-buildslave/snapshots-ref" || status=$?
$DRYRUNCMD cp abe-tests/checkout-test/workspace*/test_*.log ${ARTIFACTS}
$DRYRUNCMD rm artifacts/empty.txt
# the reports from here aren't usually needed, so are