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

Set CI to master

parent b6ed7322

.gitlab-ci.yml

+4 −4
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ build: 
    - docker

    - docker

  only:

  only:

    refs:

    refs:

      - ci-test

      - master

  script:

  script:

    - mvn clean package -DskipTests -DfinalName=vospace

    - mvn clean package -DskipTests -DfinalName=vospace

  artifacts:

  artifacts:
@@ -32,7 +32,7 @@ pre_test: 
    - docker push "${CI_REGISTRY_IMAGE}/vospace-test-env"

    - docker push "${CI_REGISTRY_IMAGE}/vospace-test-env"

  only:

  only:

    refs:

    refs:

      - ci-test

      - master

    changes:

    changes:

      - src/test/resources/testing-Dockerfile

      - src/test/resources/testing-Dockerfile
@@ -51,7 +51,7 @@ test: 
    - 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+/'

  only:

  only:

    - ci-test

    - master





dockerize:

dockerize:

  stage: dockerize

  stage: dockerize
@@ -59,7 +59,7 @@ dockerize: 
    - shell

    - shell

  only:

  only:

    refs:

    refs:

      - ci-test

      - master

  script:

  script:

    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY

    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY

    - docker build -t $CI_REGISTRY_IMAGE .

    - docker build -t $CI_REGISTRY_IMAGE .