From e0e47be5b533fc01032d5a01d3f835702ab08dc9 Mon Sep 17 00:00:00 2001
From: Athanasios Karmas <karmas@athenarc.gr>
Date: Fri, 23 Jul 2021 12:50:45 +0000
Subject: [PATCH] Minor improvement
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ff19d91e..c1959704 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,11 +35,11 @@ deploy-build-environment:
- 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${CI_PIPELINE_ID} -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
+ - while true; do x=$(oc get pods |grep simplejob${CI_PIPELINE_ID}|awk '{ print $3}');if [ $x != "Running" ]; then break; fi; sleep 10; 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 ""|wc -l) -gt 1 ]; then exit 1;fi;
+ - if [ $(cat log.txt |grep "Error:"|wc -l) -gt 1 ]; then exit 1;fi;
# delete the job from OpenShift as we have the logs here
#- oc delete job simplejob${CI_PIPELINE_ID} || true
tags:
--
GitLab