diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4db13bf92bd2d2ab69563caa207a62eee455b737..9fd074e02b00444a87f188f101dfe5d5cb836ed6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,8 +33,6 @@ test: deploy-test: stage: deploy environment: Testing - only: - - mptest when: manual variables: OS_AUTH_TYPE: v3applicationcredential @@ -46,7 +44,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 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` + - INSTANCE_ID=`openstack server create -f value -c id --prefix IMAGE_ --flavor m4 --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 9eca2931fa191bbb54e998da95345815ca62e6b1..8d7796d938dbba67164e1581c7b91270cabe39a8 100644 --- a/scripts/cloudinit.yml +++ b/scripts/cloudinit.yml @@ -67,7 +67,7 @@ runcmd: - sudo sh -c "echo \"_PIP_ADDITIONAL_REQUIREMENTS=$reqs\" >> /home/maria/data-logistics-service/dockers/.env" - echo "Bringing up the docker containers" - docker-compose -f ./dockers/docker-compose.yaml --project-directory ../airflow --verbose up airflow-init - - docker-compose -f ./dockers/docker-compose.yaml --project-directory ../airflow . up + - docker-compose -f ./dockers/docker-compose.yaml --project-directory ../airflow up -d # - /bin/bash ./scripts/deployment.sh . final_message: "The system is finally up, after $UPTIME seconds" \ No newline at end of file