diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7860381e826a311fdae665bda6b3a7f15331111f..4959cd3968e5d5b650155f2e22d5da67fc4ffe99 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 38ca7a5fc6c1ba355219cab69d27afb652a7a430..27e5d68b674186069af2807d2be8e2a4fdcc7190 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 89badae843273821b7439a5ded8d40a45c7ccb74..ea1b737897b52d39275374a06fe9e3b4a3489c27 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