From 4ab6bb8108e064a0c083253cdbcf1a4e9a48dfd4 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Wed, 16 Apr 2025 22:59:22 +0000
Subject: [PATCH] Fix GitLab CI/CD pipeline
---
src/analytics/.gitlab-ci.yml | 1 +
src/nbi/.gitlab-ci.yml | 2 +-
src/telemetry/.gitlab-ci.yml | 30 ++++++++++++++++++++++++------
3 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/src/analytics/.gitlab-ci.yml b/src/analytics/.gitlab-ci.yml
index 5f30c9aa8..1477219a3 100644
--- a/src/analytics/.gitlab-ci.yml
+++ b/src/analytics/.gitlab-ci.yml
@@ -78,6 +78,7 @@ unit_test analytics-backend:
--env ALLOW_PLAINTEXT_LISTENER=yes
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
- >
diff --git a/src/nbi/.gitlab-ci.yml b/src/nbi/.gitlab-ci.yml
index 2e280ed8a..4b3ec01ac 100644
--- a/src/nbi/.gitlab-ci.yml
+++ b/src/nbi/.gitlab-ci.yml
@@ -82,7 +82,7 @@ unit_test nbi:
- docker ps -a
- docker logs mock_tfs_nbi_dependencies
- docker logs $IMAGE_NAME
- - docker exec -i $IMAGE_NAME bash -c "coverage run --append -m pytest --log-level=INFO --verbose $IMAGE_NAME/tests/test_core.py --junitxml=/opt/results/${IMAGE_NAME}_report_core.xml"
+ - docker exec -i $IMAGE_NAME bash -c "coverage run --append -m pytest --log-level=DEBUG -o log_cli=true --verbose $IMAGE_NAME/tests/test_core.py --junitxml=/opt/results/${IMAGE_NAME}_report_core.xml"
- docker exec -i $IMAGE_NAME bash -c "coverage run --append -m pytest --log-level=INFO --verbose $IMAGE_NAME/tests/test_tfs_api.py --junitxml=/opt/results/${IMAGE_NAME}_report_tfs_api.xml"
- docker exec -i $IMAGE_NAME bash -c "coverage run --append -m pytest --log-level=INFO --verbose $IMAGE_NAME/tests/test_ietf_l2vpn.py --junitxml=/opt/results/${IMAGE_NAME}_report_ietf_l2vpn.xml"
- docker exec -i $IMAGE_NAME bash -c "coverage run --append -m pytest --log-level=INFO --verbose $IMAGE_NAME/tests/test_ietf_network.py --junitxml=/opt/results/${IMAGE_NAME}_report_ietf_network.xml"
diff --git a/src/telemetry/.gitlab-ci.yml b/src/telemetry/.gitlab-ci.yml
index 9ac995e63..1f82042af 100644
--- a/src/telemetry/.gitlab-ci.yml
+++ b/src/telemetry/.gitlab-ci.yml
@@ -72,10 +72,19 @@ unit_test telemetry-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
- KAFKA_IP=$(docker inspect kafka --format "{{.NetworkSettings.Networks.teraflowbridge.IPAddress}}")
@@ -156,10 +165,19 @@ unit_test telemetry-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
- KAFKA_IP=$(docker inspect kafka --format "{{.NetworkSettings.Networks.teraflowbridge.IPAddress}}")
--
GitLab