Commit d26bacd2 authored by Sergio Gonzalez Diaz's avatar Sergio Gonzalez Diaz
Browse files

Merge branch 'feat/fix-cobertura' into 'develop' 

Feat/fix cobertura

See merge request teraflow-h2020/controller!103
parents 5e603368 b56f6870

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ include: 
  - local: '/src/opticalattackmitigator/.gitlab-ci.yml'

  - local: '/src/opticalcentralizedattackdetector/.gitlab-ci.yml'

  - local: '/src/automation/.gitlab-ci.yml'

  - local: '/src/webui/.gitlab-ci.yml'

  #- local: '/src/webui/.gitlab-ci.yml'

  #- local: '/src/l3_distributedattackdetector/.gitlab-ci.yml'

  #- local: '/src/l3_centralizedattackdetector/.gitlab-ci.yml'

  #- local: '/src/l3_attackmitigator/.gitlab-ci.yml'

src/automation/.gitlab-ci.yml

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ unit_test automation: 
  coverage: '/JaCoCo Coverage Total: ([0-9]{1,3})%/'

  artifacts:

    reports:

      cobertura: ${REPORTS_PATH}/cobertura.xml

      junit:

        - ${REPORTS_PATH}/surefire-reports/TEST-*.xml

  rules:

src/compute/.gitlab-ci.yml

+1 −3
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ unit test compute: 
    - docker ps -a

    - docker logs $IMAGE_NAME

    - docker exec -i $IMAGE_NAME bash -c "coverage run -m pytest --log-level=INFO --verbose $IMAGE_NAME/tests/test_unitary.py --junitxml=/opt/results/${IMAGE_NAME}_report.xml"

    - docker exec -i $IMAGE_NAME bash -c "coverage xml -o /opt/results/${IMAGE_NAME}_coverage.xml"

    - docker exec -i $IMAGE_NAME bash -c "coverage report --include='${IMAGE_NAME}/*' --show-missing"

  coverage: '/TOTAL\s+\d+\s+\d+\s+(\d+%)/'

  after_script:
@@ -76,7 +75,6 @@ unit test compute: 
      when: always

      reports:

        junit: src/$IMAGE_NAME/tests/${IMAGE_NAME}_report.xml

        cobertura: src/$IMAGE_NAME/tests/${IMAGE_NAME}_coverage.xml



# Deployment of the service in Kubernetes Cluster

deploy compute:

src/context/.gitlab-ci.yml

+0 −2
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ unit test context: 
    - docker ps -a

    - docker logs $IMAGE_NAME

    - docker exec -i $IMAGE_NAME bash -c "coverage run -m pytest --log-level=INFO --verbose $IMAGE_NAME/tests/test_unitary.py --junitxml=/opt/results/${IMAGE_NAME}_report.xml"

    - docker exec -i $IMAGE_NAME bash -c "coverage xml -o /opt/results/${IMAGE_NAME}_coverage.xml"

    - docker exec -i $IMAGE_NAME bash -c "coverage report --include='${IMAGE_NAME}/*' --show-missing"

  coverage: '/TOTAL\s+\d+\s+\d+\s+(\d+%)/'

  after_script:
@@ -79,7 +78,6 @@ unit test context: 
      when: always

      reports:

        junit: src/$IMAGE_NAME/tests/${IMAGE_NAME}_report.xml

        cobertura: src/$IMAGE_NAME/tests/${IMAGE_NAME}_coverage.xml



# Deployment of the service in Kubernetes Cluster

deploy context:

src/dbscanserving/.gitlab-ci.yml

+0 −2
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ unit test dbscanserving: 
    - docker ps -a

    - docker logs $IMAGE_NAME

    - docker exec -i $IMAGE_NAME bash -c "coverage run -m pytest --log-level=INFO --verbose $IMAGE_NAME/tests/test_unitary.py --junitxml=/opt/results/${IMAGE_NAME}_report.xml"

    - docker exec -i $IMAGE_NAME bash -c "coverage xml -o /opt/results/${IMAGE_NAME}_coverage.xml"

    - docker exec -i $IMAGE_NAME bash -c "coverage report --include='${IMAGE_NAME}/*' --show-missing"

  coverage: '/TOTAL\s+\d+\s+\d+\s+(\d+%)/'

  after_script:
@@ -76,7 +75,6 @@ unit test dbscanserving: 
    when: always

    reports:

      junit: src/$IMAGE_NAME/tests/${IMAGE_NAME}_report.xml

      cobertura: src/$IMAGE_NAME/tests/${IMAGE_NAME}_coverage.xml





# Deployment of the dbscanserving service in Kubernetes Cluster