Commit 487277b5 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'fix/ci-pipeline-webui-l3-all' into 'develop' 

Solved issues with CI pipeline, WebUI test reports, and L3* deployment manifests.

See merge request teraflow-h2020/controller!88
parents 3677b4dd 9e13972b

manifests/l3_attackmitigatorservice.yaml

+5 −5
Original line number Diff line number Diff line 
apiVersion: apps/v1

kind: Deployment

metadata:

  name: l3_attackmitigatorservice

  name: l3-attackmitigatorservice

spec:

  selector:

    matchLabels:

      app: l3_attackmitigatorservice

      app: l3-attackmitigatorservice

  template:

    metadata:

      labels:

        app: l3_attackmitigatorservice

        app: l3-attackmitigatorservice

    spec:

      terminationGracePeriodSeconds: 5

      containers:
@@ -38,11 +38,11 @@ spec: 
apiVersion: v1

kind: Service

metadata:

  name: l3_attackmitigatorservice

  name: l3-attackmitigatorservice

spec:

  type: ClusterIP

  selector:

    app: l3_attackmitigatorservice

    app: l3-attackmitigatorservice

  ports:

  - name: grpc

    port: 10002

manifests/l3_centralizedattackdetectorservice.yaml

+5 −5
Original line number Diff line number Diff line 
apiVersion: apps/v1

kind: Deployment

metadata:

  name: l3_centralizedattackdetectorservice

  name: l3-centralizedattackdetectorservice

spec:

  selector:

    matchLabels:

      app: l3_centralizedattackdetectorservice

      app: l3-centralizedattackdetectorservice

  template:

    metadata:

      labels:

        app: l3_centralizedattackdetectorservice

        app: l3-centralizedattackdetectorservice

    spec:

      terminationGracePeriodSeconds: 5

      containers:
@@ -38,11 +38,11 @@ spec: 
apiVersion: v1

kind: Service

metadata:

  name: l3_centralizedattackdetectorservice

  name: l3-centralizedattackdetectorservice

spec:

  type: ClusterIP

  selector:

    app: l3_centralizedattackdetectorservice

    app: l3-centralizedattackdetectorservice

  ports:

  - name: grpc

    port: 10001

manifests/l3_distributedattackdetectorservice.yaml

+5 −5
Original line number Diff line number Diff line 
apiVersion: apps/v1

kind: Deployment

metadata:

  name: l3_distributedattackdetectorservice

  name: l3-distributedattackdetectorservice

spec:

  selector:

    matchLabels:

      app: l3_distributedattackdetectorservice

      app: l3-distributedattackdetectorservice

  template:

    metadata:

      labels:

        app: l3_distributedattackdetectorservice

        app: l3-distributedattackdetectorservice

    spec:

      terminationGracePeriodSeconds: 5

      containers:
@@ -38,11 +38,11 @@ spec: 
apiVersion: v1

kind: Service

metadata:

  name: l3_distributedattackdetectorservice

  name: l3-distributedattackdetectorservice

spec:

  type: ClusterIP

  selector:

    app: l3_distributedattackdetectorservice

    app: l3-distributedattackdetectorservice

  ports:

  - name: grpc

    port: 10000

src/webui/.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ unit test webui: 
    - sleep 5

    - docker ps -a

    - 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; ls -la /opt/results; coverage report --include='${IMAGE_NAME}/*' --show-missing"

    - docker exec --user root -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; ls -la /opt/results; coverage report --include='${IMAGE_NAME}/*' --show-missing"

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

  after_script:

    - docker rm -f $IMAGE_NAME