From 0299be9cb31f3421f7f45feef730cd1d98763a51 Mon Sep 17 00:00:00 2001
From: Christian Boettcher <c.boettcher@fz-juelich.de>
Date: Wed, 11 Aug 2021 12:00:38 +0200
Subject: [PATCH] variable management
---
.gitlab-ci.yml | 4 ++--
deploy_scripts/deployment.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4959cd3..6e89a58 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -82,8 +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 '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'
+ - 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/deployment.sh b/deploy_scripts/deployment.sh
index ea1b737..3e3ba1f 100755
--- a/deploy_scripts/deployment.sh
+++ b/deploy_scripts/deployment.sh
@@ -8,7 +8,7 @@ OLD_DIR=`pwd`
echo "DEBUG_1 $0 $1 $2 $3"
-if [ -z ${1+x} ]; then NEW_DIR=`pwd`; fi
+if [ -z ${1+x} ]; then NEW_DIR=`pwd`; else NEW_DIR=$1; 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
--
GitLab