From 553a0be8aa9d87ac6041e71b9e0b36b149ac09e3 Mon Sep 17 00:00:00 2001
From: Maria Petrova <m.petrova@fz-juelich.de>
Date: Thu, 16 Sep 2021 10:37:27 +0200
Subject: [PATCH] Update

---
 .gitlab-ci.yml        | 2 +-
 scripts/cloudinit.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b354d41..83ad1f1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,7 +42,7 @@ deploy-test:
   script:
     - echo "Starting the full testing deployment of airflows example."
     - pip install python-openstackclient
-    - INSTANCE_ID=`openstack server create -f value -c id --prefix IMAGE_ --flavor s2 --image 149a65b5-aeb8-499f-aaa6-ec966bd28dd6 --user-data scripts/cloudinit.yml --security-group ssh --security-group airflows --security-group www --security-group https airflow-testing`
+    - INSTANCE_ID=`openstack server create -f value -c id --prefix IMAGE_ --flavor m2 --image 149a65b5-aeb8-499f-aaa6-ec966bd28dd6 --user-data scripts/cloudinit.yml --security-group ssh --security-group airflows --security-group www --security-group https airflow-testing`
     - while [ "`openstack server show $INSTANCE_ID -c addresses -f value`" = "{}" ]; do sleep 5; done # wait until an address is available to attach the floating ip
     - openstack server add floating ip $INSTANCE_ID $FLOATING_IP
     - echo "Done"
diff --git a/scripts/cloudinit.yml b/scripts/cloudinit.yml
index 43d46cf..b210996 100644
--- a/scripts/cloudinit.yml
+++ b/scripts/cloudinit.yml
@@ -52,8 +52,8 @@ runcmd:
   - mkdir airflow-testing
   - cd airflow-testing
   - mkdir -p ./dags ./logs ./plugins
-  - cp -r ../data-logistics-service/dags/* ./dags
+  - cp ../data-logistics-service/dags/* ./dags
   - echo "AIRFLOW_UID=0\nAIRFLOW_GID=0" > .env #for root
   - docker-compose -f ../data-logistics-service/dockers/docker-compose.yaml --project-directory . up airflow-init
-  - docker-compose -f ../data-logistics-service/dockers/docker-compose.yaml --project-directory . up -d
+  - docker-compose -f ../data-logistics-service/dockers/docker-compose.yaml --project-directory . up
   # - /bin/bash ../data-logistics-service/scripts/deployment.sh .
-- 
GitLab