use trap to copy test files to artifacts dir on exit

tetchel · Feb 7, 2019 · e526436 · e526436
1 parent 53fface
commit e526436
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/test-prow-e2e.sh b/test-prow-e2e.sh
@@ -5,6 +5,13 @@ set -exuo pipefail
 ARTIFACT_DIR=/tmp/artifacts
 export ARTIFACT_DIR
 
+function copyArtifacts {
+  echo "Copying artifacts from $(pwd)..."
+  cp -rv ./gui_test_screenshots "${ARTIFACT_DIR}/gui_test_screenshots"
+}
+
+trap copyArtifacts EXIT
+
 ./build.sh
 
 oc login -u kubeadmin -p $(cat "${ARTIFACT_DIR}/installer/auth/kubeadmin-password")
@@ -14,6 +21,4 @@ source ./contrib/oc-environment.sh
 kubectl create -f https://raw.githubusercontent.com/operator-framework/operator-lifecycle-manager/master/deploy/okd/manifests/0.8.0/0000_30_06-rh-operators.configmap.yaml
 kubectl create -f https://raw.githubusercontent.com/operator-framework/operator-lifecycle-manager/master/deploy/okd/manifests/0.8.0/0000_30_09-rh-operators.catalogsource.yaml
 
-./test-gui.sh e2e
-
-cp -rv ./frontend/gui_test_screenshots "${ARTIFACT_DIR}/gui_test_screenshots"
+. ./test-gui.sh e2e