Fix GitLab CI/CD pipeline

src/analytics/.gitlab-ci.yml

@@ -86,7 +86,8 @@ unit_test analytics-backend:
       --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
+    - while ! docker logs kafka 2>&1 | grep -q 'Kafka Server started'; do sleep 1; done
+    - sleep 5 # Give extra time to Kafka to get stabilized
     - docker inspect kafka --format "{{.NetworkSettings.Networks}}"
     - KAFKA_IP=$(docker inspect kafka --format "{{.NetworkSettings.Networks.teraflowbridge.IPAddress}}")
     - echo $KAFKA_IP    
@@ -180,7 +181,8 @@ unit_test analytics-frontend:
       --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
+    - while ! docker logs kafka 2>&1 | grep -q 'Kafka Server started'; do sleep 1; done
+    - sleep 5 # Give extra time to Kafka to get stabilized
     - docker inspect kafka --format "{{.NetworkSettings.Networks}}"
     - KAFKA_IP=$(docker inspect kafka --format "{{.NetworkSettings.Networks.teraflowbridge.IPAddress}}")
     - echo $KAFKA_IP

src/analytics/frontend/tests/test_frontend.py

@@ -41,7 +41,7 @@ from apscheduler.triggers.interval                       import IntervalTrigger
 
 LOCAL_HOST = '127.0.0.1'
 
-ANALYTICS_FRONTEND_PORT = str(get_service_port_grpc(ServiceNameEnum.ANALYTICS))
+ANALYTICS_FRONTEND_PORT = 10000 + int(get_service_port_grpc(ServiceNameEnum.ANALYTICS))
 os.environ[get_env_var_name(ServiceNameEnum.ANALYTICS, ENVVAR_SUFIX_SERVICE_HOST     )] = str(LOCAL_HOST)
 os.environ[get_env_var_name(ServiceNameEnum.ANALYTICS, ENVVAR_SUFIX_SERVICE_PORT_GRPC)] = str(ANALYTICS_FRONTEND_PORT)
 

src/kpi_value_api/.gitlab-ci.yml

@@ -76,7 +76,8 @@ unit_test kpi-value-api:
       --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
+    - while ! docker logs kafka 2>&1 | grep -q 'Kafka Server started'; do sleep 1; done
+    - sleep 5 # Give extra time to Kafka to get stabilized
     - docker inspect kafka --format "{{.NetworkSettings.Networks}}"
     - KAFKA_IP=$(docker inspect kafka --format "{{.NetworkSettings.Networks.teraflowbridge.IPAddress}}")
     - echo $KAFKA_IP

src/kpi_value_writer/.gitlab-ci.yml

@@ -76,7 +76,8 @@ unit_test kpi-value-writer:
       --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
+    - while ! docker logs kafka 2>&1 | grep -q 'Kafka Server started'; do sleep 1; done
+    - sleep 5 # Give extra time to Kafka to get stabilized
     - docker inspect kafka --format "{{.NetworkSettings.Networks}}"
     - KAFKA_IP=$(docker inspect kafka --format "{{.NetworkSettings.Networks.teraflowbridge.IPAddress}}")
     - echo $KAFKA_IP

src/nbi/.gitlab-ci.yml

@@ -76,7 +76,8 @@ unit_test nbi:
       --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
+    - while ! docker logs kafka 2>&1 | grep -q 'Kafka Server started'; do sleep 1; done
+    - sleep 5 # Give extra time to Kafka to get stabilized
     - docker inspect kafka --format "{{.NetworkSettings.Networks}}"
     - KAFKA_IP=$(docker inspect kafka --format "{{.NetworkSettings.Networks.teraflowbridge.IPAddress}}")
     - echo $KAFKA_IP

src/telemetry/.gitlab-ci.yml

@@ -86,7 +86,8 @@ unit_test telemetry-backend:
       --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
+    - while ! docker logs kafka 2>&1 | grep -q 'Kafka Server started'; do sleep 1; done
+    - sleep 5 # Give extra time to Kafka to get stabilized
     - docker inspect kafka --format "{{.NetworkSettings.Networks}}"
     - KAFKA_IP=$(docker inspect kafka --format "{{.NetworkSettings.Networks.teraflowbridge.IPAddress}}")
     - echo $KAFKA_IP    
@@ -180,7 +181,8 @@ unit_test telemetry-frontend:
       --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
+    - while ! docker logs kafka 2>&1 | grep -q 'Kafka Server started'; do sleep 1; done
+    - sleep 5 # Give extra time to Kafka to get stabilized
     - docker inspect kafka --format "{{.NetworkSettings.Networks}}"
     - KAFKA_IP=$(docker inspect kafka --format "{{.NetworkSettings.Networks.teraflowbridge.IPAddress}}")
     - echo $KAFKA_IP

src/telemetry/frontend/tests/test_frontend.py

@@ -37,7 +37,7 @@ from telemetry.frontend.service.TelemetryFrontendServiceServicerImpl import Tele
 
 LOCAL_HOST = '127.0.0.1'
 
-TELEMETRY_FRONTEND_PORT = str(get_service_port_grpc(ServiceNameEnum.TELEMETRY))
+TELEMETRY_FRONTEND_PORT = 10000 + int(get_service_port_grpc(ServiceNameEnum.TELEMETRY))
 os.environ[get_env_var_name(ServiceNameEnum.TELEMETRY, ENVVAR_SUFIX_SERVICE_HOST     )] = str(LOCAL_HOST)
 os.environ[get_env_var_name(ServiceNameEnum.TELEMETRY, ENVVAR_SUFIX_SERVICE_PORT_GRPC)] = str(TELEMETRY_FRONTEND_PORT)