Commit d176d21c authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Updated CI

parent 80ba5eca

.gitlab-ci.yml

+8 −12
Original line number Diff line number Diff line
@@ -7,9 +7,8 @@ stages: 
  tags:

    - docker

  rules:

    - if: '$CI_COMMIT_BRANCH != "master"'

      when: never

    - changes:

    - if: '$CI_COMMIT_BRANCH == "master"'

      changes:

        - gms-client/gms-client/*



build_gms_client:
@@ -42,9 +41,8 @@ test_gms: 
    - awk -F"," '{ instructions += $4 + $5; covered += $5 } END { print "coverage=" 100*covered/instructions }' target/site/jacoco/jacoco.csv

  coverage: '/coverage=\d+\.\d+/'

  rules:

    - if: '$CI_COMMIT_BRANCH != "master"'

      when: never

    - changes:

    - if: '$CI_COMMIT_BRANCH == "master"'

      changes:

        - gms/*



deploy_gms_client:
@@ -66,9 +64,8 @@ dockerize_db: 
    - docker build -t "${CI_REGISTRY_IMAGE}/database" -f database/Dockerfile .

    - docker push "${CI_REGISTRY_IMAGE}/database"

  rules:

    - if: '$CI_COMMIT_BRANCH != "master"'

      when: never

    - changes:

    - if: '$CI_COMMIT_BRANCH == "master"'

      changes:

        - database/*

        - gms/src/main/resources/sql/*
@@ -81,8 +78,7 @@ dockerize_gms: 
    - docker build -t "${CI_REGISTRY_IMAGE}" -f gms/Dockerfile .

    - docker push "${CI_REGISTRY_IMAGE}"

  rules:

    - if: '$CI_COMMIT_BRANCH != "master"'

      when: never

    - changes:

    - if: '$CI_COMMIT_BRANCH == "master"'

      changes:

        - gms/*

        - gms-ui/*