diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b354d41c584919ace85938523dcb1e2d4deb960e..83ad1f1d23a6ce57da2141626b87e71e0f04a840 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 43d46cfa3e55ee42e65ba4a11ef5ad327d195256..b210996116684538a8991d98396bb838f3240614 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 .