From d7ff768955de99d23eedf8499fa9890002ce625c Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Tue, 22 Apr 2025 08:34:41 +0000
Subject: [PATCH] Fix GitLab CI/CD pipeline
---
src/analytics/.gitlab-ci.yml | 34 +++++++++++++++++++++++++++-------
src/telemetry/.gitlab-ci.yml | 2 ++
2 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/src/analytics/.gitlab-ci.yml b/src/analytics/.gitlab-ci.yml
index 1477219a3..ce17a040c 100644
--- a/src/analytics/.gitlab-ci.yml
+++ b/src/analytics/.gitlab-ci.yml
@@ -72,10 +72,19 @@ unit_test analytics-backend:
--env ALLOW_ANONYMOUS_LOGIN=yes
bitnami/zookeeper:latest
- sleep 10 # Wait for Zookeeper to start
+ #- >
+ # docker run --name kafka -d --network=teraflowbridge -p 9092:9092
+ # --env KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181
+ # --env ALLOW_PLAINTEXT_LISTENER=yes
+ # bitnami/kafka:latest
- >
- docker run --name kafka -d --network=teraflowbridge -p 9092:9092
- --env KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181
- --env ALLOW_PLAINTEXT_LISTENER=yes
+ docker run --name kafka -d --network=teraflowbridge -p 9092:9092 -p 9093:9093
+ --env KAFKA_CFG_NODE_ID=1
+ --env KAFKA_CFG_PROCESS_ROLES=controller,broker
+ --env KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093
+ --env KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT
+ --env KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER
+ --env KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=1@kafka:9093
bitnami/kafka:latest
- sleep 20 # Wait for Kafka to start
- docker inspect kafka --format "{{.NetworkSettings.Networks}}
@@ -157,12 +166,22 @@ unit_test analytics-frontend:
--env ALLOW_ANONYMOUS_LOGIN=yes
bitnami/zookeeper:latest
- sleep 10 # Wait for Zookeeper to start
+ #- >
+ # docker run --name kafka -d --network=teraflowbridge -p 9092:9092
+ # --env KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181
+ # --env ALLOW_PLAINTEXT_LISTENER=yes
+ # bitnami/kafka:latest
- >
- docker run --name kafka -d --network=teraflowbridge -p 9092:9092
- --env KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181
- --env ALLOW_PLAINTEXT_LISTENER=yes
+ docker run --name kafka -d --network=teraflowbridge -p 9092:9092 -p 9093:9093
+ --env KAFKA_CFG_NODE_ID=1
+ --env KAFKA_CFG_PROCESS_ROLES=controller,broker
+ --env KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093
+ --env KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT
+ --env KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER
+ --env KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=1@kafka:9093
bitnami/kafka:latest
- sleep 20 # Wait for Kafka to start
+ - docker inspect kafka --format "{{.NetworkSettings.Networks}}
- KAFKA_IP=$(docker inspect kafka --format "{{.NetworkSettings.Networks.teraflowbridge.IPAddress}}")
- echo $KAFKA_IP
- docker logs zookeeper
@@ -179,11 +198,12 @@ unit_test analytics-frontend:
- docker logs ${IMAGE_NAME}-frontend
- >
docker exec -i ${IMAGE_NAME}-frontend bash -c
- "coverage run -m pytest --log-level=INFO --verbose --junitxml=/opt/results/${IMAGE_NAME}-frontend_report.xml $IMAGE_NAME/frontend/tests/test_*.py"
+ "coverage run -m pytest --log-level=DEBUG -o log_cli=true --verbose --junitxml=/opt/results/${IMAGE_NAME}-frontend_report.xml $IMAGE_NAME/frontend/tests/test_*.py"
- docker exec -i ${IMAGE_NAME}-frontend bash -c "coverage report --include='${IMAGE_NAME}/*' --show-missing"
coverage: '/TOTAL\s+\d+\s+\d+\s+(\d+%)/'
after_script:
- docker rm -f ${IMAGE_NAME}-frontend
+ - docker rm -f crdb
- docker rm -f zookeeper
- docker rm -f kafka
- docker volume rm -f crdb
diff --git a/src/telemetry/.gitlab-ci.yml b/src/telemetry/.gitlab-ci.yml
index 4ce841858..3b362768b 100644
--- a/src/telemetry/.gitlab-ci.yml
+++ b/src/telemetry/.gitlab-ci.yml
@@ -87,6 +87,7 @@ unit_test telemetry-backend:
--env KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=1@kafka:9093
bitnami/kafka:latest
- sleep 20 # Wait for Kafka to start
+ - docker inspect kafka --format "{{.NetworkSettings.Networks}}
- KAFKA_IP=$(docker inspect kafka --format "{{.NetworkSettings.Networks.teraflowbridge.IPAddress}}")
- echo $KAFKA_IP
- >
@@ -180,6 +181,7 @@ unit_test telemetry-frontend:
--env KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=1@kafka:9093
bitnami/kafka:latest
- sleep 20 # Wait for Kafka to start
+ - docker inspect kafka --format "{{.NetworkSettings.Networks}}
- KAFKA_IP=$(docker inspect kafka --format "{{.NetworkSettings.Networks.teraflowbridge.IPAddress}}")
- echo $KAFKA_IP
- docker logs zookeeper
--
GitLab