From 00cf53d479f054c92946292501c0b3267f522844 Mon Sep 17 00:00:00 2001
From: Bo-Chun Louis Chen <louistw@uab.edu>
Date: Mon, 22 Apr 2024 14:52:15 -0500
Subject: [PATCH] Remove unnecessary condition
Since the job only run in schedule pipeline after !74 merged
---
.gitlab-ci.yml | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0cf3b6e..57a48b7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
|| FAILED=true
- |
- if [ $CI_PIPELINE_SOURCE == 'merge_request_event' ]; then
- ssh -o StrictHostKeyChecking=no acctsvc@$FLOATING_IP '[ $(mount | grep "etc/auto" | wc -l) -eq 6 ]' || FAILED=true
- elif [ $CI_PIPELINE_SOURCE == 'schedule' ]; then
- cp "$SSH_KNOWN_HOSTS" ~/.ssh/known_hosts
- 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
+ cp "$SSH_KNOWN_HOSTS" ~/.ssh/known_hosts
+ 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
- |
if [ "$FAILED" = true ]; then
if [ "${DELETE_WHEN_FAILED-true}" = true ]; then
@@ -309,10 +305,7 @@ test_ood_image:
fi
false
fi
- - |
- if [ $CI_PIPELINE_SOURCE = "schedule" ]; then
- openstack server remove floating ip $NEW_INSTANCE_ID $FLOATING_IP
- fi
+ - openstack server remove floating ip $NEW_INSTANCE_ID $FLOATING_IP
artifacts:
reports:
dotenv: instance.env
--
GitLab