From cf016e7ea33c0cc9a90d0dc1bf6be57f3b4c596f Mon Sep 17 00:00:00 2001
From: Sergio <sergio.gonzalez.diaz@atos.net>
Date: Mon, 24 Jan 2022 11:42:01 +0100
Subject: [PATCH] Code coverage
---
.gitlab-ci.yml | 1 +
src/coverage/.gitlab-ci.yml | 16 ++++++++++++++++
src/monitoring/.gitlab-ci.yml | 10 ----------
3 files changed, 17 insertions(+), 10 deletions(-)
create mode 100644 src/coverage/.gitlab-ci.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fcb0b8964..a943f3a23 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,3 +26,4 @@ include:
- local: '/src/l3_distributedattackdetector/.gitlab-ci.yml'
- local: '/src/l3_centralizedattackdetector/.gitlab-ci.yml'
- local: '/src/l3_attackmitigator/.gitlab-ci.yml'
+ - local: '/src/coverage/.gitlab-ci.yml'
diff --git a/src/coverage/.gitlab-ci.yml b/src/coverage/.gitlab-ci.yml
new file mode 100644
index 000000000..36ca7ccc8
--- /dev/null
+++ b/src/coverage/.gitlab-ci.yml
@@ -0,0 +1,16 @@
+# Report code coverage
+code coverage:
+ stage: coverage
+ needs:
+ - unit test monitoring
+ script:
+ - cd src
+ - ./coverage_report.sh
+ coverage: '/TOTAL\s+\d+\s+\d+\s+(\d+%)/'
+ 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"'
+ - changes:
+ - src/monitoring/*
+ - manifests/*.yaml
+ - .gitlab-ci.yml
\ No newline at end of file
diff --git a/src/monitoring/.gitlab-ci.yml b/src/monitoring/.gitlab-ci.yml
index dd95706c7..22c221eb7 100644
--- a/src/monitoring/.gitlab-ci.yml
+++ b/src/monitoring/.gitlab-ci.yml
@@ -72,16 +72,6 @@ unit test monitoring:
reports:
junit: src/$IMAGE_NAME/tests/${IMAGE_NAME}_report.xml
cobertura: src/$IMAGE_NAME/tests/${IMAGE_NAME}_coverage.xml
-
-# Report code coverage
-code coverage:
- stage: coverage
- needs:
- - unit test monitoring
- script:
- - cd src
- - ./coverage_report.sh
- coverage: '/TOTAL\s+\d+\s+\d+\s+(\d+%)/'
# Deployment of the service in Kubernetes Cluster
deploy monitoring:
--
GitLab