From 0a821bfa097a0c5c1448567597123fecba560f38 Mon Sep 17 00:00:00 2001
From: Maria Petrova <m.petrova@fz-juelich.de>
Date: Wed, 8 Dec 2021 16:55:27 +0100
Subject: [PATCH] Fix tests in CI CD

---
 .gitlab-ci.yml | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0d28080..906c26d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,19 +60,6 @@ full-deploy-test:
     - openstack server add floating ip $INSTANCE_ID $TEST_IP
     - echo "Done"
 
-test-testing_webserver:
-  cache: {}
-  stage: test-deployment 
-  # only:
-  #   - master
-  except:
-    - tags
-  script:
-    - apt update && apt -y install curl
-    - echo "For now, this will be a basic health check i.e. GET / and check for 2xx code."
-    - sleep 150 # ensure that the docker containers are up and running before testing the airflow installation
-    - 'curl --insecure -I -H "Accept: application/json" $TESTING_URL'
-
 test-testing_dags:
   cache: {}
   stage: test-deployment 
@@ -81,8 +68,10 @@ test-testing_dags:
   except:
     - tags
   script:
+    - apt update && apt -y install curl
     - echo "This is a simple check if the deploments was successful and dags get executed"
     - sleep 150 # ensure that the docker containers are up and running before testing the airflow installation
+    - 'curl --insecure -I -H "Accept: application/json" $TESTING_URL'
     - 'curl -X GET -u airflow:airflow -H "Content-Type: application/json" $TEST_IP:7001/api/v1/dags'
     - 'curl -X GET -u airflow:airflow -H "Content-Type: application/json" $TEST_IP:7001/api/v1/connections'
     - 'curl -X POST -u airflow:airflow -H "Content-Type: application/json" --data {} $TEST_IP:7001/api/v1/dags/testdag/dagRuns'
-- 
GitLab