From aaafd0731156108a23b4d4fdd61867e313d60e90 Mon Sep 17 00:00:00 2001
From: Maria Petrova <m.petrova@fz-juelich.de>
Date: Mon, 6 Dec 2021 14:06:01 +0100
Subject: [PATCH] Correcting mishaps
---
.gitlab-ci.yml | 2 ++
scripts/cloudinit.yml | 4 +++-
scripts/deployment.sh | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a66d784..70e46ca 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 bda2a35..743a594 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 af09dae..214169d 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
--
GitLab