diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a916df625e50aad1e62a22bdf8e0a2fb91defac9..953f6256a59c4cf9e7ade7fe25bbff05e02789c5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -145,7 +145,7 @@ deploy: REGISTRY_URL: sharing-codeability.uibk.ac.at:5051 IMAGE_TAG: sharing-codeability.uibk.ac.at:5051/development/sharing/codeability-sharing-platform/gitsearch/$CI_COMMIT_REF_NAME script: - - ssh contDeploy@codeability-austria -p 1022 "export CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME && export COMMIT_DATE=$(git show -s --format=%ct $CI_COMMIT_SHA) && cd gitsearch2/gitsearch && git fetch && git stash && git checkout $CI_COMMIT_REF_NAME && git pull && ./manual_deploy.sh && exit" + - ssh contDeploy@codeability-austria -p 1022 "export CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME && export COMMIT_DATE=$(git show -s --format=%ct $CI_COMMIT_SHA) && export GITSEARCH_PATH=${GITSEARCH_PATH} && cd gitsearch2/gitsearch && git fetch && git stash && git checkout $CI_COMMIT_REF_NAME && git pull && ./manual_deploy.sh && exit" when: manual deployProd: diff --git a/manual_deploy.sh b/manual_deploy.sh index 68512f3a1b69ea17685d15e5cfae587610e05534..afbab0850dd5e29b1a854de8359271eadb454feb 100755 --- a/manual_deploy.sh +++ b/manual_deploy.sh @@ -1,5 +1,5 @@ #!/bin/bash -echo "Deploying Gitsearch" +echo "Deploying Gitsearch in directory ${GITSEARCH_PATH}" if [[ -z "${CI_COMMIT_REF_NAME}" ]]; then @@ -16,7 +16,7 @@ else source /home/contDeploy/gitsearch2/gitsearch/src/main/docker/.env else # Handle other branches or provide a default - echo "Using default or other branch settings" + echo "Using default or other branch settings for ${GITBRANCH}" fi echo "Deploying via pipeline" diff --git a/src/main/resources/at/ac/uibk/gitsearch/service/gitlab_events/metaData_elasticSearch.schema.json b/src/main/resources/at/ac/uibk/gitsearch/service/gitlab_events/metaData_elasticSearch.schema.json index 0b9ecd2e993bf6878cf7448db16f748d5b90d702..d4498a47b1ee7d37407a0c451f8f400ddaccffc2 100644 --- a/src/main/resources/at/ac/uibk/gitsearch/service/gitlab_events/metaData_elasticSearch.schema.json +++ b/src/main/resources/at/ac/uibk/gitsearch/service/gitlab_events/metaData_elasticSearch.schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-07/schema#", "title": "Metadata", - "description": "A metadata description of a repository", + "description": "A metadata description of a repository. This is used for syntax checking of incoming meta data.", "type": "object", "properties": { "assesses": {