Commit 7ccce09e authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Updated CI

parent 59ad1691

.gitlab-ci.yml

+10 −5
Original line number Original line Diff line number Diff line
@@ -8,9 +8,10 @@ stages: 
  tags:

  tags:

    - docker

    - docker

  rules:

  rules:

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

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

      changes:

      changes:

        - gms-client/gms-client/*

        - gms-client/gms-client/*

        - .gitlab-ci.yml





build_gms_client:

build_gms_client:

  extends: .gms_client

  extends: .gms_client
@@ -42,9 +43,10 @@ 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_REF_NAME == "master"'

      changes:

      changes:

        - gms/*

        - gms/*

        - .gitlab-ci.yml





deploy_gms_client:

deploy_gms_client:

  extends: .gms_client

  extends: .gms_client
@@ -74,9 +76,10 @@ deploy_gms_lib: 
        -Durl=${IA2_MVN_REPO_SNAPSHOTS}

        -Durl=${IA2_MVN_REPO_SNAPSHOTS}

        -DpomFile=pom.xml

        -DpomFile=pom.xml

  rules:

  rules:

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

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

      changes:

      changes:

        - gms/*

        - gms/*

        - .gitlab-ci.yml





dockerize_db:

dockerize_db:

  stage: deploy

  stage: deploy
@@ -87,10 +90,11 @@ 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_REF_NAME == "master"'

      changes:

      changes:

        - database/*

        - database/*

        - gms/src/main/resources/sql/*

        - gms/src/main/resources/sql/*

        - .gitlab-ci.yml





dockerize_gms:

dockerize_gms:

  stage: deploy

  stage: deploy
@@ -101,10 +105,11 @@ 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_REF_NAME == "master"'

      changes:

      changes:

        - gms/*

        - gms/*

        - gms-ui/*

        - gms-ui/*

        - .gitlab-ci.yml





upload_jar:

upload_jar:

  stage: publish

  stage: publish