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

Set CI to master

parent b6ed7322
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ build:
    - docker
  only:
    refs:
      - ci-test
      - master
  script:
    - mvn clean package -DskipTests -DfinalName=vospace
  artifacts:
@@ -32,7 +32,7 @@ pre_test:
    - docker push "${CI_REGISTRY_IMAGE}/vospace-test-env"
  only:
    refs:
      - ci-test
      - master
    changes:
      - 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
  coverage: '/coverage=\d+\.\d+/'
  only:
    - ci-test
    - master

dockerize:
  stage: dockerize
@@ -59,7 +59,7 @@ dockerize:
    - shell
  only:
    refs:
      - ci-test
      - master
  script:
    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
    - docker build -t $CI_REGISTRY_IMAGE .