diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c3e23fdc5043cf3a9128bdb8a2db6291c28cbf01..96bdb9e3dec589939a9e31008f5d70accbe6c226 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,10 +32,10 @@ deploy-build-environment:
     - pod=$(oc get pods |grep simplejob${CI_PIPELINE_ID}|awk '{ print $1}')
     - oc rsync copy_folder $pod:/opt/app-root/src
     # when build job finishes get the logs
-    - while true; do x=$(oc get pods |grep simplejob${CI_PIPELINE_ID}|awk '{ print $3}');if [ $x != "Running" ]; then break; fi; sleep 1; done 
+    - while true; do sleep 10; x=$(oc get pods |grep $pod|awk '{ print $3}');if [ $x != "Running" ]; then break; fi; done 
     - 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 1 ]; then exit 1;fi;
+    - 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: