From 9e13972b0b704966d9425e03be4dede62cb1c4c1 Mon Sep 17 00:00:00 2001
From: Lluis Gifre <lluis.gifre@cttc.es>
Date: Fri, 11 Feb 2022 16:53:45 +0000
Subject: [PATCH] Solved issues with CI pipeline, WebUI test reports, and L3*
 deployment manifests.

---
 manifests/l3_attackmitigatorservice.yaml           | 10 +++++-----
 manifests/l3_centralizedattackdetectorservice.yaml | 10 +++++-----
 manifests/l3_distributedattackdetectorservice.yaml | 10 +++++-----
 src/webui/.gitlab-ci.yml                           |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/manifests/l3_attackmitigatorservice.yaml b/manifests/l3_attackmitigatorservice.yaml
index 34f660324..2f5a2fc24 100644
--- a/manifests/l3_attackmitigatorservice.yaml
+++ b/manifests/l3_attackmitigatorservice.yaml
@@ -1,15 +1,15 @@
 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
diff --git a/manifests/l3_centralizedattackdetectorservice.yaml b/manifests/l3_centralizedattackdetectorservice.yaml
index 0393d83c2..52a831beb 100644
--- a/manifests/l3_centralizedattackdetectorservice.yaml
+++ b/manifests/l3_centralizedattackdetectorservice.yaml
@@ -1,15 +1,15 @@
 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
diff --git a/manifests/l3_distributedattackdetectorservice.yaml b/manifests/l3_distributedattackdetectorservice.yaml
index eff047b1b..63f7dd5a0 100644
--- a/manifests/l3_distributedattackdetectorservice.yaml
+++ b/manifests/l3_distributedattackdetectorservice.yaml
@@ -1,15 +1,15 @@
 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
diff --git a/src/webui/.gitlab-ci.yml b/src/webui/.gitlab-ci.yml
index 3ecfbe5ea..304b5190b 100644
--- a/src/webui/.gitlab-ci.yml
+++ b/src/webui/.gitlab-ci.yml
@@ -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
-- 
GitLab