diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a66d784130d35cb6faea4b5eac2d7ee45efca025..70e46ca5080c204853b6e198b96ce900e1ea9eb9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,6 +61,8 @@ cleanup-successful-full-deployment: when: on_success # only: # - web + dependencies: + - deploy:full-deploy-test script: - echo "This is the cleanup for the full-redeployment of the testing or production servers" - echo "if this job is reached, all earlier jobs were successful, and any lingering old instances need to be removed" diff --git a/scripts/cloudinit.yml b/scripts/cloudinit.yml index bda2a35b255b572ae69436f6850aae69538bb40d..743a59488aa11cd7d90aa51c0204e4d3e3b66753 100644 --- a/scripts/cloudinit.yml +++ b/scripts/cloudinit.yml @@ -48,12 +48,14 @@ users: # - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDQMbfKUO3NoZspgWpzFY+SwY5Tx251oBT/F22pmnqKq3A0U1EcRooYVc11HzDmLrDTkoLSWAYPuv7I8weKqUPMlypXygu7I1kw1JoAZ4veV/TO8kBIb8+fUjD4VnD0EuU9/MD4rc0IazlInUu/5H2oDj4cj3XGoOFHAPRvo1YXF2eEbXgHcos5o52idZfvZPeWmk4wLqWUI+4q1C5o+c9xGxdWkA0Z6cErw5jSfaqIMu9GnsaPE8dDZ89vtNu8kRK97/Ax0qmJ8eLBfv3qm2HnqACRUv1MRLS/s9KsdB18DV6dTn8VuErJsn9rlpx/2oEMVS5lkUSLTJHf7oNVKDtILQ/rQ2tF/f3LakmiViA4ZsWxFspP0T/sXPhjuCgEqGWG8HrJwFj8DByMpoJUsGe1czAiMdoY5Tr7UeIgK7BGaGjoVUFaVrCKlDpDNhYsHopSTTNajVxsb0LkTRIRphGlQTHlD3nDYdHIrgZiLqA1XLtTTXtWNzQ4uE59tAkIzdTK7RSBduHunqx++IEO6Huj49Vvk1vcO33iqFTTZro1vhZ2kEGxAkxNMti+/eT2rvyfkhsXaUH1/7LXvRrR+pFKcXBpaWWeEt8cOiVrMWAPDi9VRh5QPZbJ1tyTq7XzxeaQuJhL22o2BO13ZSRzr1S+UNFcmfk3esruZoxDIiQ+Bw== apiserver@gitlab runcmd: + - echo "Downloading latest version of docker-compose" - sudo pip3 install docker-compose - cd /home/mpetrova - - echo "Current user: $(whoami)" + - echo "Current user is $(whoami)" - sudo -u mpetrova git clone https://gitlab.jsc.fz-juelich.de/eflows4hpc-wp2/data-logistics-service.git ./data-logistics-service - cd ./data-logistics-service - git checkout mptest #only for testing + - cat ./scripts/deployment.sh # - mkdir airflow # - cd airflow # - mkdir -p ./dags ./logs ./plugins ./config ./templates diff --git a/scripts/deployment.sh b/scripts/deployment.sh index af09daea2ad60095ff70ce2526e29aec6d2f33ac..214169d0e145950d8212556418a593927645c27e 100755 --- a/scripts/deployment.sh +++ b/scripts/deployment.sh @@ -24,7 +24,7 @@ cd airflow AIRFLOW_DIR=`pwd` #DEBUG prints echo "Project dir is set to: $AIRFLOW_DIR" -echo "Proceeding as user: $(whoami)" +echo "Proceeding as user $(whoami)" # Make the necessary folders for the airflow artefacts and copy the corresponging content mkdir -p ./dags ./logs ./plugins ./config ./templates