diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fcb499cb13cc03a61a8acb649521f3d363269a12..27cfc6f26e793ad939c07f40055982c87652f4d9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,13 +33,17 @@ deploy-build-environment:
     - cat simplejob.yml
     # select the project in openshift
     - oc project jupyterhub-int
-    # delete the job (if exist)
-    #- oc delete job simplejob || true
     # start the deploy job
     - oc create -f simplejob.yml
     # wait for job to finish https://stackoverflow.com/questions/5073453wait-for-kubernetes-job-to-complete-on-either-failure-success-using-command-line
-    - oc get job/simplejob${CI_PIPELINE_ID} -o=jsonpath='{.status}' -w && oc get job/simplejob -o=jsonpath='{.status.conditions[*].type}' | grep -i -E 'failed|complete' || echo 'Failed' 
-    - oc logs jobs/simplejob${CI_PIPELINE_ID}
+    #- oc get job/simplejob${CI_PIPELINE_ID} -o=jsonpath='{.status}' -w && oc get job/simplejob -o=jsonpath='{.status.conditions[*].type}' | grep -i -E 'failed|complete' || echo 'Failed'
+    - while true; do x=$(oc get pods |grep simplejob${CI_PIPELINE_ID}|awk '{ print $3}');if [ $x != "Running" ]; then break; fi;done 
+    # when build job finishes get the logs
+    - oc logs jobs/simplejob${CI_PIPELINE_ID} | tee log.txt
+    # if spack install has failed, fail the pipeline
+    - if [ $(cat log.txt |grep "Error:"|wc -l) -gt 0 ]; then exit 1;fi;
+    # delete the job from OpenShift as we have the logs here
+    #- oc delete job simplejob${CI_PIPELINE_ID} || true
   tags:
     - shell-runner