Unverified Commit 9b108c41 authored by Karthik Satchitanand's avatar Karthik Satchitanand Committed by GitHub

Merge pull request #11 from nsathyaseelan/update-ci

Update gitlab ci yaml and job monitor logic script
parents cfe3f8ad 2ef82bd4
......@@ -106,17 +106,17 @@ postgres-jiva-run/load/check 1:2:
- ./script/apps/postgres/workload/jiva/postgres-app-workload-jiva
# CASSANDRA-JIVA
cassandra-jiva-run/load/check 0:2:
cassandra-jiva-run/load/check:
extends: .app_deploy_template
script:
- ./script/apps/cassandra/deployer/cassandra-app-deploy-jiva
cassandra-jiva-run/load/check 1:2:
extends: .app_deploy_template
before_script:
- sleep 180
script:
- ./script/apps/cassandra/workload/jiva/cassandra-app-workload-jiva
#cassandra-jiva-run/load/check 1:2:
# extends: .app_deploy_template
# before_script:
# - sleep 180
# script:
# - ./script/apps/cassandra/workload/jiva/cassandra-app-workload-jiva
# JENKINS-JIVA
jenkins-jiva-run/load/check:
......@@ -151,17 +151,17 @@ mongo-cstor-run/load/check 1:2:
- ./script/apps/mongo/workload/cstor/mongo-app-workload-cstor
# CASSANDRA_CSTOR
cassandra-cstor-run/load/check 0:2:
cassandra-cstor-run/load/check:
extends: .app_deploy_template
script:
- ./script/apps/cassandra/deployer/cassandra-app-deploy-cstor
cassandra-cstor-run/load/check 1:2:
extends: .app_deploy_template
before_script:
- sleep 180
script:
- ./script/apps/cassandra/workload/cstor/cassandra-app-workload-cstor
#cassandra-cstor-run/load/check 1:2:
# extends: .app_deploy_template
# before_script:
# - sleep 180
# script:
# - ./script/apps/cassandra/workload/cstor/cassandra-app-workload-cstor
# JENKINS_CSTOR
jenkins-cstor-run/load/check:
......
......@@ -28,14 +28,29 @@ jobStateCmd="kubectl get pod ${litmus_pod} --no-headers -n litmus -o custom-colu
## TODO: Consider cases where litmus pod is evicted
while [[ ! $(eval ${containerStateCmd}) =~ 'terminated' ]]; do
sleep 1
done
while [[ $(eval ${jobStateCmd}) =~ 'Running' ]]; do
sleep 1
while true; do
cstate=$(eval ${containerStateCmd}); rc=$?
if [[ $rc -eq 0 && ! -z $cstate ]]; then
if [[ ! $cstate =~ 'terminated' ]]; then
sleep 10
else break;
fi
else
echo "unable to get litmus container status"; exit 1
fi
done
while true; do
jstate=$(eval ${jobStateCmd}); rc=$?
if [[ $rc -eq 0 && ! -z $jstate ]]; then
if [[ $jstate =~ 'Running' ]]; then
sleep 10
else break;
fi
else
echo "unable to get litmus job status"; exit 1
fi
done
echo "Litmus test run Job has completed"
${utils_path}/task_delimiter;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment