Skip to content
Snippets Groups Projects
Commit 00cf53d4 authored by Bo-Chun Chen's avatar Bo-Chun Chen
Browse files

Remove unnecessary condition

Since the job only run in schedule pipeline after !74 merged
parent 5a68d67e
No related branches found
No related tags found
1 merge request!87Fix integration project separation
...@@ -293,14 +293,10 @@ test_ood_image: ...@@ -293,14 +293,10 @@ test_ood_image:
curl --retry 10 --retry-delay 20 --retry-connrefused https://knightly.rc.uab.edu/Shibboleth.sso/Metadata --resolve knightly.rc.uab.edu:443:$FLOATING_IP -kf curl --retry 10 --retry-delay 20 --retry-connrefused https://knightly.rc.uab.edu/Shibboleth.sso/Metadata --resolve knightly.rc.uab.edu:443:$FLOATING_IP -kf
|| FAILED=true || FAILED=true
- | - |
if [ $CI_PIPELINE_SOURCE == 'merge_request_event' ]; then cp "$SSH_KNOWN_HOSTS" ~/.ssh/known_hosts
ssh -o StrictHostKeyChecking=no acctsvc@$FLOATING_IP '[ $(mount | grep "etc/auto" | wc -l) -eq 6 ]' || FAILED=true chmod 644 ~/.ssh/known_hosts
elif [ $CI_PIPELINE_SOURCE == 'schedule' ]; then until ssh acctsvc@$FLOATING_IP hostname; do sleep 5; done
cp "$SSH_KNOWN_HOSTS" ~/.ssh/known_hosts ssh acctsvc@$FLOATING_IP '[ $(mount | grep "etc/auto" | wc -l) -eq 6 ]' || FAILED=true
chmod 644 ~/.ssh/known_hosts
until ssh acctsvc@$FLOATING_IP hostname; do sleep 5; done;
ssh acctsvc@$FLOATING_IP '[ $(mount | grep "etc/auto" | wc -l) -eq 6 ]' || FAILED=true
fi
- | - |
if [ "$FAILED" = true ]; then if [ "$FAILED" = true ]; then
if [ "${DELETE_WHEN_FAILED-true}" = true ]; then if [ "${DELETE_WHEN_FAILED-true}" = true ]; then
...@@ -309,10 +305,7 @@ test_ood_image: ...@@ -309,10 +305,7 @@ test_ood_image:
fi fi
false false
fi fi
- | - openstack server remove floating ip $NEW_INSTANCE_ID $FLOATING_IP
if [ $CI_PIPELINE_SOURCE = "schedule" ]; then
openstack server remove floating ip $NEW_INSTANCE_ID $FLOATING_IP
fi
artifacts: artifacts:
reports: reports:
dotenv: instance.env dotenv: instance.env
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment