diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4959cd3968e5d5b650155f2e22d5da67fc4ffe99..6e89a589d018ddfa65eed92bd8defb8ebb8f4c6b 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 ea1b737897b52d39275374a06fe9e3b4a3489c27..3e3ba1f3528c1e612a051993999945805fb31f86 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