diff --git a/AssignmentChecker/.gitlab-ci/00_vars.yml b/AssignmentChecker/.gitlab-ci/00_vars.yml index 0af94a753b6ffab5f8892ded39d9b10a92f8e05c..e54032a7ae7d354f3da1d4b7fd6d93058b42cb64 100644 --- a/AssignmentChecker/.gitlab-ci/00_vars.yml +++ b/AssignmentChecker/.gitlab-ci/00_vars.yml @@ -6,9 +6,14 @@ variables: DOCKER_TLS_CERTDIR: DOCKER_DRIVER: overlay2 + DOCKER_REGISTRY: docker.io + DOCKER_REGISTRY_USER: dojohesso + DOCKER_REGISTRY_IMAGE: dojohesso/dojo_assignment_checker + PROJECT_NAME: DojoAssignmentChecker VERSION_DEV_SUFFIX: '-dev' + VERSION_TEST_SUFFIX: '-test' GITLAB_API_PROJECT_URL: ${CI_API_V4_URL}/projects/${CI_PROJECT_ID} diff --git a/AssignmentChecker/.gitlab-ci/01_functions.yml b/AssignmentChecker/.gitlab-ci/01_functions.yml index f0675a514e20658a7d87932f65073487c89cc028..fc18fd14cdd1b9402f144999303957f4e43995e6 100644 --- a/AssignmentChecker/.gitlab-ci/01_functions.yml +++ b/AssignmentChecker/.gitlab-ci/01_functions.yml @@ -1,7 +1,19 @@ +.get_vars: + script: + - IS_DEV=$([[ $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $CI_COMMIT_BRANCH != "test" ]] && echo true || echo false) + - IS_TEST=$([[ $CI_COMMIT_BRANCH == "test" ]] && echo true || echo false) + - | + if [[ $IS_TEST == true ]]; then + DOCKER_REGISTRY_USER="dojohessotest" + DOCKER_REGISTRY_IMAGE="dojohesso/dojo-test_assignment_checker" + DOCKER_REGISTRY_PASSWORD=$DOCKER_TEST_REGISTRY_PASSWORD + DOTENV_PROD_KEY=$DOTENV_TEST_KEY + fi + + .get_version: script: - - IS_DEV=$([[ $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH ]] && echo false || echo true) - - VERSION=$(jq -r .version $PROJECT_FOLDER/package.json)$([[ $IS_DEV == true ]] && echo $VERSION_DEV_SUFFIX || echo '') + - VERSION=$(jq -r .version $PROJECT_FOLDER/package.json)$([[ $IS_TEST == true ]] && echo $VERSION_TEST_SUFFIX || echo '' )$([[ $IS_DEV == true ]] && echo $VERSION_DEV_SUFFIX || echo '') .get_packages_url: @@ -21,7 +33,7 @@ # Init docker buildx - | - if [ $CI_COMMIT_REF_PROTECTED == "true" ]; then + if [[ $CI_COMMIT_REF_PROTECTED == "true" || $IS_TEST == true ]]; then docker login -u $DOCKER_REGISTRY_USER -p $DOCKER_REGISTRY_PASSWORD $DOCKER_REGISTRY fi - docker buildx create --use @@ -41,12 +53,11 @@ - cd $PROJECT_FOLDER - sed -i -r "s/\{\{VERSION\}\}/${VERSION}/g" src/app.ts - | - if [ $CI_COMMIT_REF_PROTECTED == "true" ]; then + if [[ $CI_COMMIT_REF_PROTECTED == "true" || $IS_TEST == true ]]; then echo "Decrypt production env vars" sed -i -r "s/(DOTENV_KEY[ ]*:[ ]*[\'\"\`])[^'\"\`]*([\'\"\`])([ ]*\,)?//g" src/app.ts sed -i -r "s/,[\ \n]*\}/\}/g" src/app.ts npx dotenv-vault local decrypt "${DOTENV_PROD_KEY}" > .env - fi - cd .. diff --git a/AssignmentChecker/.gitlab-ci/03_stages.yml b/AssignmentChecker/.gitlab-ci/03_stages.yml index 198b85a3eeb84675229f3459f1457de2b9c2f2f9..a996ecac4ea23db0640d1c6767b1780748aeccbe 100644 --- a/AssignmentChecker/.gitlab-ci/03_stages.yml +++ b/AssignmentChecker/.gitlab-ci/03_stages.yml @@ -4,4 +4,7 @@ stages: - build - clean - upload - - release \ No newline at end of file + - release + +before_script: + - !reference [ .get_vars, script ] \ No newline at end of file diff --git a/AssignmentChecker/.gitlab-ci/05_stageTest.yml b/AssignmentChecker/.gitlab-ci/05_stageTest.yml index a1b564295624124e216ae7bba18ac6950590eccb..ccb013bcc6113315e83da6b2190787d73ee11903 100644 --- a/AssignmentChecker/.gitlab-ci/05_stageTest.yml +++ b/AssignmentChecker/.gitlab-ci/05_stageTest.yml @@ -9,4 +9,4 @@ test:build: script: - !reference [ .build_script, script ] rules: - - if: '$CI_COMMIT_TAG =~ "/^$/" && $CI_COMMIT_REF_PROTECTED != "true"' \ No newline at end of file + - if: '$CI_COMMIT_TAG =~ "/^$/" && $CI_COMMIT_REF_PROTECTED != "true" && $CI_COMMIT_BRANCH != "test"' \ No newline at end of file diff --git a/AssignmentChecker/.gitlab-ci/06_stageBuild.yml b/AssignmentChecker/.gitlab-ci/06_stageBuild.yml index e2acdd1042c77d84b45e63e3b8b2cdaf217d92bc..a0c6ca411fd86c59aa49fd601563bd262e3ef89f 100644 --- a/AssignmentChecker/.gitlab-ci/06_stageBuild.yml +++ b/AssignmentChecker/.gitlab-ci/06_stageBuild.yml @@ -12,4 +12,4 @@ build:version: # Here docker buildx can use cached images created in previous step - docker buildx build --platform $DOCKER_PLATFORMS --file $DOCKERFILE --push --tag $CONTAINER_IMAGE . rules: - - if: '$CI_COMMIT_REF_PROTECTED == "true"' \ No newline at end of file + - if: '$CI_COMMIT_REF_PROTECTED == "true" || $CI_COMMIT_BRANCH == "test"' \ No newline at end of file diff --git a/AssignmentChecker/.gitlab-ci/09_stageRelease.yml b/AssignmentChecker/.gitlab-ci/09_stageRelease.yml index 325d173cd88c4336e573d1dd33f6ffbe7745c653..ad039e9aa41609db7d147f941fdf6bd73aa3a41b 100644 --- a/AssignmentChecker/.gitlab-ci/09_stageRelease.yml +++ b/AssignmentChecker/.gitlab-ci/09_stageRelease.yml @@ -12,7 +12,7 @@ release:dockerhub:latest: # Push latest tag - docker buildx imagetools create $CONTAINER_IMAGE --tag $DOCKER_REGISTRY_IMAGE:latest rules: - - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' + - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH == "test"' release:wiki: