From 3c7c6af93d8da81c51be921e049411963a28a160 Mon Sep 17 00:00:00 2001
From: Christian Boettcher <c.boettcher@fz-juelich.de>
Date: Wed, 11 Aug 2021 11:55:29 +0200
Subject: [PATCH] remove git from deploy script
---
.gitlab-ci.yml | 3 ++-
deploy_scripts/cloudinit.yml | 2 +-
deploy_scripts/deployment.sh | 14 +++++---------
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7860381..4959cd3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -82,7 +82,8 @@ light-deploy-testing:
TESTING_URL: https://zam10036.zam.kfa-juelich.de/
TESTING_DOMAIN: zam10036.zam.kfa-juelich.de
script:
- - ssh -oStrictHostKeyChecking=accept-new apiserver@$TESTING_DOMAIN 'sudo /home/apiserver/datacatalog/deploy_scripts/deployment.sh /home/apiserver/datacatalog $CI_COMMIT_BRANCH $TESTING_URL $TESTING_DOMAIN'
+ - ssh -oStrictHostKeyChecking=accept-new apiserver@$TESTING_DOMAIN 'cd /home/apiserver/datacatalog && sudo git pull --all && sudo git checkout -f $CI_COMMIT_BRANCH'
+ - ssh -oStrictHostKeyChecking=accept-new apiserver@$TESTING_DOMAIN 'sudo /home/apiserver/datacatalog/deploy_scripts/deployment.sh /home/apiserver/datacatalog $TESTING_URL $TESTING_DOMAIN'
full-deploy-production:
stage: deploy
diff --git a/deploy_scripts/cloudinit.yml b/deploy_scripts/cloudinit.yml
index 38ca7a5..27e5d68 100644
--- a/deploy_scripts/cloudinit.yml
+++ b/deploy_scripts/cloudinit.yml
@@ -53,4 +53,4 @@ runcmd:
# general startup takes long enough that no delay should bee needed - 5 to 6 minutes until these commands are executed
- 'export API_URL=https://datacatalog.fz-juelich.de/'
- 'export SERVER_DOMAIN=datacatalog.fz-juelich.de'
- - /bin/bash /home/apiserver/datacatalog/deploy_scripts/deployment.sh /home/apiserver/datacatalog master $API_URL $SERVER_DOMAIN
\ No newline at end of file
+ - /bin/bash /home/apiserver/datacatalog/deploy_scripts/deployment.sh /home/apiserver/datacatalog $API_URL $SERVER_DOMAIN
\ No newline at end of file
diff --git a/deploy_scripts/deployment.sh b/deploy_scripts/deployment.sh
index 89badae..ea1b737 100755
--- a/deploy_scripts/deployment.sh
+++ b/deploy_scripts/deployment.sh
@@ -2,24 +2,20 @@
## USAGE:
#
-# deployment.sh <git_directory> [CHECKOUT_TAG] [API_URL] [SERVER_DOMAIN]
+# deployment.sh <git_directory> [API_URL] [SERVER_DOMAIN]
OLD_DIR=`pwd`
-echo "DEBUG_1 $0 $1 $2 $3 $4"
+echo "DEBUG_1 $0 $1 $2 $3"
if [ -z ${1+x} ]; then NEW_DIR=`pwd`; fi
-if [ -z ${2+x} ]; then CHECKOUT_TAG=master; else CHECKOUT_TAG=$2; fi
-if [ -z ${3+x} ]; then API_URL=https://datacatalog.fz-juelich.de/; else API_URL=$3; fi
-if [ -z ${4+x} ]; then SERVER_DOMAIN=datacatalog.fz-juelich.de; else SERVER_DOMAIN=$4; fi
+if [ -z ${2+x} ]; then API_URL=https://datacatalog.fz-juelich.de/; else API_URL=$2; fi
+if [ -z ${3+x} ]; then SERVER_DOMAIN=datacatalog.fz-juelich.de; else SERVER_DOMAIN=$3; fi
-echo "DEBUG_2 $0 $1 $2 $3 $4"
+echo "DEBUG_2 $0 $1 $2 $3"
cd $NEW_DIR
-git pull --all
-git checkout -f $CHECKOUT_TAG
-
pip install -r requirements.txt
python3 frontend/createStatic.py -u $API_URL
--
GitLab