From d28cfb9846f75bab4812b300ac4d00b424637e12 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Tue, 1 Oct 2024 15:09:19 +0000
Subject: [PATCH] Fix Telemetry Analytics, KPI Manager CI/CD pipeline
---
.gitlab-ci.yml | 1 +
src/analytics/.gitlab-ci.yml | 7 ++++---
src/kpi_value_writer/.gitlab-ci.yml | 5 ++++-
src/telemetry/.gitlab-ci.yml | 3 ++-
4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cb6ea273b..a67d2346c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,5 +50,6 @@ include:
- local: '/src/kpi_value_writer/.gitlab-ci.yml'
- local: '/src/telemetry/.gitlab-ci.yml'
- local: '/src/analytics/.gitlab-ci.yml'
+
# This should be last one: end-to-end integration tests
- local: '/src/tests/.gitlab-ci.yml'
diff --git a/src/analytics/.gitlab-ci.yml b/src/analytics/.gitlab-ci.yml
index 6992443d7..8f17fbfdb 100644
--- a/src/analytics/.gitlab-ci.yml
+++ b/src/analytics/.gitlab-ci.yml
@@ -151,11 +151,12 @@ unit_test analytics-frontend:
- CRDB_ADDRESS=$(docker inspect crdb --format "{{.NetworkSettings.Networks.teraflowbridge.IPAddress}}")
- echo $CRDB_ADDRESS
- >
- docker run --name zookeeper -d --network=teraflowbridge -p 2181:2181 \
- -e ALLOW_ANONYMOUS_LOGIN=yes \
+ docker run --name zookeeper -d --network=teraflowbridge -p 2181:2181
+ -e ALLOW_ANONYMOUS_LOGIN=yes
bitnami/zookeeper:latest
- sleep 10 # Wait for Zookeeper to start
- - docker run --name kafka -d --network=teraflowbridge -p 9092:9092
+ - >
+ docker run --name kafka -d --network=teraflowbridge -p 9092:9092
--env KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181
--env ALLOW_PLAINTEXT_LISTENER=yes
bitnami/kafka:latest
diff --git a/src/kpi_value_writer/.gitlab-ci.yml b/src/kpi_value_writer/.gitlab-ci.yml
index 9a2f9fd47..f00b9208d 100644
--- a/src/kpi_value_writer/.gitlab-ci.yml
+++ b/src/kpi_value_writer/.gitlab-ci.yml
@@ -61,7 +61,8 @@ unit_test kpi-value-writer:
docker run --name zookeeper -d --network=teraflowbridge -p 2181:2181
bitnami/zookeeper:latest
- sleep 10 # Wait for Zookeeper to start
- - docker run --name kafka -d --network=teraflowbridge -p 9092:9092
+ - >
+ docker run --name kafka -d --network=teraflowbridge -p 9092:9092
--env KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181
--env ALLOW_PLAINTEXT_LISTENER=yes
bitnami/kafka:latest
@@ -76,6 +77,8 @@ unit_test kpi-value-writer:
$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG
- sleep 5
- docker ps -a
+ - docker logs zookeeper
+ - docker logs kafka
- docker logs $IMAGE_NAME
- >
docker exec -i $IMAGE_NAME bash -c
diff --git a/src/telemetry/.gitlab-ci.yml b/src/telemetry/.gitlab-ci.yml
index 11ee4bb6a..68ffbda52 100644
--- a/src/telemetry/.gitlab-ci.yml
+++ b/src/telemetry/.gitlab-ci.yml
@@ -155,7 +155,8 @@ unit_test telemetry-frontend:
-e ALLOW_ANONYMOUS_LOGIN=yes
bitnami/zookeeper:latest
- sleep 10 # Wait for Zookeeper to start
- - docker run --name kafka -d --network=teraflowbridge -p 9092:9092
+ - >
+ docker run --name kafka -d --network=teraflowbridge -p 9092:9092
--env KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181
--env ALLOW_PLAINTEXT_LISTENER=yes
bitnami/kafka:latest
--
GitLab