Commit 0d715111 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'feat/opticalcentralizedattackdetector-service' into 'develop' 

Integration of code coverage reports.

See merge request teraflow-h2020/controller!72
parents c0b557cf d33e4394

.gitlab-ci.yml

+3 −3
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ include: 
  - local: '/src/context/.gitlab-ci.yml'

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

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

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

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

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

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

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

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

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

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

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

src/dbscanserving/.gitlab-ci.yml

+13 −6
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ build dbscanserving: 
    - docker build -t "$IMAGE_NAME:$IMAGE_TAG" -f ./src/$IMAGE_NAME/Dockerfile ./src/

    - docker tag "$IMAGE_NAME:$IMAGE_TAG" "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"

    - docker push "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"

  # after_script:

  #   - docker rmi $(docker images --quiet --filter=dangling=true)

  after_script:

    - docker images --filter="dangling=true" --quiet | xargs -r docker rmi

  rules:

    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)'

    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "develop"'
@@ -37,12 +37,14 @@ unit test dbscanserving: 
    - if docker container ls | grep $IMAGE_NAME; then docker rm -f $IMAGE_NAME; else echo "$IMAGE_NAME image is not in the system"; fi

  script:

    - docker pull "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"

    - docker run --name $IMAGE_NAME -d -p 10006:10006 --network=teraflowbridge --rm $CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG

    - docker run --name $IMAGE_NAME -d -p 10006:10006 -v "$PWD/src/$IMAGE_NAME/tests:/opt/results" --network=teraflowbridge --rm $CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG

    - sleep 5

    - docker ps -a

    - docker exec -i $IMAGE_NAME bash -c "pytest --log-level=DEBUG --verbose $IMAGE_NAME/tests/test_unitary.py"

    - docker logs $IMAGE_NAME

    - docker exec -i $IMAGE_NAME bash -c "coverage run -m pytest --log-level=DEBUG --verbose $IMAGE_NAME/tests/test_unitary.py --junitxml=/opt/results/${IMAGE_NAME}_report.xml; coverage xml -o /opt/results/${IMAGE_NAME}_coverage.xml; coverage report --include='${IMAGE_NAME}/*' --show-missing"

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

  after_script:

    #- docker rm -f $IMAGE_NAME

    - docker rm -f $IMAGE_NAME

    - docker network rm teraflowbridge

  rules:

    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)'
@@ -52,8 +54,13 @@ unit test dbscanserving: 
      - src/$IMAGE_NAME/Dockerfile

      - src/$IMAGE_NAME/tests/*.py

      - src/$IMAGE_NAME/tests/Dockerfile

      - manifests/$IMAGE_NAMEservice.yaml

      - manifests/${IMAGE_NAME}service.yaml

      - .gitlab-ci.yml

  artifacts:

    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

src/dbscanserving/requirements.in

+2 −1
Original line number Diff line number Diff line
@@ -4,3 +4,4 @@ pytest 
pytest-benchmark

grpcio

scikit-learn

coverage
 
 No newline at end of file

src/opticalattackmitigator/.gitlab-ci.yml

+11 −5
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ build opticalattackmitigator: 
    - docker build -t "$IMAGE_NAME:$IMAGE_TAG" -f ./src/$IMAGE_NAME/Dockerfile ./src/

    - docker tag "$IMAGE_NAME:$IMAGE_TAG" "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"

    - docker push "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"

  # after_script:

  #   - docker rmi $(docker images --quiet --filter=dangling=true)

  after_script:

    - docker images --filter="dangling=true" --quiet | xargs -r docker rmi

  rules:

    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)'

    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "develop"'
@@ -37,12 +37,13 @@ unit test opticalattackmitigator: 
    - if docker container ls | grep $IMAGE_NAME; then docker rm -f $IMAGE_NAME; else echo "$IMAGE_NAME image is not in the system"; fi

  script:

    - docker pull "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"

    - docker run --name $IMAGE_NAME -d -p 10007:10007 --network=teraflowbridge --rm $CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG

    - docker run --name $IMAGE_NAME -d -p 10007:10007 -v "$PWD/src/$IMAGE_NAME/tests:/opt/results" --network=teraflowbridge --rm $CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG

    - sleep 5

    - docker ps -a

    - docker exec -i $IMAGE_NAME bash -c "pytest --log-level=DEBUG --verbose $IMAGE_NAME/tests/test_unitary.py"

    - docker exec -i $IMAGE_NAME bash -c "coverage run -m pytest --log-level=DEBUG --verbose $IMAGE_NAME/tests/test_unitary.py --junitxml=/opt/results/${IMAGE_NAME}_report.xml; coverage xml -o /opt/results/${IMAGE_NAME}_coverage.xml; coverage report --include='${IMAGE_NAME}/*' --show-missing"

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

  after_script:

    #- docker rm -f $IMAGE_NAME

    - docker rm -f $IMAGE_NAME

    - docker network rm teraflowbridge

  rules:

    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)'
@@ -54,6 +55,11 @@ unit test opticalattackmitigator: 
      - src/$IMAGE_NAME/tests/Dockerfile

      - manifests/$IMAGE_NAMEservice.yaml

      - .gitlab-ci.yml

  artifacts:

    when: always

    reports:

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

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





# Deployment of the opticalattackmitigator service in Kubernetes Cluster

src/opticalattackmitigator/requirements.in

+1 −0
Original line number Diff line number Diff line
@@ -7,3 +7,4 @@ redis 
# from the monitoring component

influxdb

python-json-logger

coverage