Skip to content
Snippets Groups Projects
Commit d176d21c authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Updated CI

parent 80ba5eca
No related branches found
No related tags found
No related merge requests found
Pipeline #1910 passed
...@@ -7,9 +7,8 @@ stages: ...@@ -7,9 +7,8 @@ stages:
tags: tags:
- docker - docker
rules: rules:
- if: '$CI_COMMIT_BRANCH != "master"' - if: '$CI_COMMIT_BRANCH == "master"'
when: never changes:
- changes:
- gms-client/gms-client/* - gms-client/gms-client/*
build_gms_client: build_gms_client:
...@@ -42,9 +41,8 @@ test_gms: ...@@ -42,9 +41,8 @@ test_gms:
- awk -F"," '{ instructions += $4 + $5; covered += $5 } END { print "coverage=" 100*covered/instructions }' target/site/jacoco/jacoco.csv - awk -F"," '{ instructions += $4 + $5; covered += $5 } END { print "coverage=" 100*covered/instructions }' target/site/jacoco/jacoco.csv
coverage: '/coverage=\d+\.\d+/' coverage: '/coverage=\d+\.\d+/'
rules: rules:
- if: '$CI_COMMIT_BRANCH != "master"' - if: '$CI_COMMIT_BRANCH == "master"'
when: never changes:
- changes:
- gms/* - gms/*
deploy_gms_client: deploy_gms_client:
...@@ -66,9 +64,8 @@ dockerize_db: ...@@ -66,9 +64,8 @@ dockerize_db:
- docker build -t "${CI_REGISTRY_IMAGE}/database" -f database/Dockerfile . - docker build -t "${CI_REGISTRY_IMAGE}/database" -f database/Dockerfile .
- docker push "${CI_REGISTRY_IMAGE}/database" - docker push "${CI_REGISTRY_IMAGE}/database"
rules: rules:
- if: '$CI_COMMIT_BRANCH != "master"' - if: '$CI_COMMIT_BRANCH == "master"'
when: never changes:
- changes:
- database/* - database/*
- gms/src/main/resources/sql/* - gms/src/main/resources/sql/*
...@@ -81,8 +78,7 @@ dockerize_gms: ...@@ -81,8 +78,7 @@ dockerize_gms:
- docker build -t "${CI_REGISTRY_IMAGE}" -f gms/Dockerfile . - docker build -t "${CI_REGISTRY_IMAGE}" -f gms/Dockerfile .
- docker push "${CI_REGISTRY_IMAGE}" - docker push "${CI_REGISTRY_IMAGE}"
rules: rules:
- if: '$CI_COMMIT_BRANCH != "master"' - if: '$CI_COMMIT_BRANCH == "master"'
when: never changes:
- changes:
- gms/* - gms/*
- gms-ui/* - gms-ui/*
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment