From c6d4374e6403c825a11aefe121265dfcb477e504 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Tue, 22 Apr 2025 17:50:44 +0000
Subject: [PATCH] Fix GitLab CI/CD pipeline
---
src/common/tools/kafka/Variables.py | 2 +-
src/kpi_value_api/.gitlab-ci.yml | 1 +
src/kpi_value_writer/.gitlab-ci.yml | 1 +
src/monitoring/requirements.in | 2 +-
src/telemetry/backend/requirements.in | 1 +
src/telemetry/requirements.in | 2 +-
6 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/common/tools/kafka/Variables.py b/src/common/tools/kafka/Variables.py
index 515a43f16..4537c3e0d 100644
--- a/src/common/tools/kafka/Variables.py
+++ b/src/common/tools/kafka/Variables.py
@@ -82,7 +82,7 @@ class KafkaTopic(Enum):
LOGGER.debug('All topics already existed.')
return True
- create_topic_future_map = kafka_admin_client.create_topics(missing_topics)
+ create_topic_future_map = kafka_admin_client.create_topics(missing_topics, request_timeout=5*60)
LOGGER.debug('create_topic_future_map: {:s}'.format(str(create_topic_future_map)))
failed_topic_creations = set()
for topic, future in create_topic_future_map.items():
diff --git a/src/kpi_value_api/.gitlab-ci.yml b/src/kpi_value_api/.gitlab-ci.yml
index 55d6c3504..fa27ccc4b 100644
--- a/src/kpi_value_api/.gitlab-ci.yml
+++ b/src/kpi_value_api/.gitlab-ci.yml
@@ -98,6 +98,7 @@ unit_test kpi-value-api:
- docker exec -i $IMAGE_NAME bash -c "coverage report --include='${IMAGE_NAME}/*' --show-missing"
coverage: '/TOTAL\s+\d+\s+\d+\s+(\d+%)/'
after_script:
+ - docker ps -a
- docker rm -f $IMAGE_NAME
- docker rm -f kafka
#- docker rm -f zookeeper
diff --git a/src/kpi_value_writer/.gitlab-ci.yml b/src/kpi_value_writer/.gitlab-ci.yml
index 4393bf556..e4aec2aa8 100644
--- a/src/kpi_value_writer/.gitlab-ci.yml
+++ b/src/kpi_value_writer/.gitlab-ci.yml
@@ -98,6 +98,7 @@ unit_test kpi-value-writer:
- docker exec -i $IMAGE_NAME bash -c "coverage report --include='${IMAGE_NAME}/*' --show-missing"
coverage: '/TOTAL\s+\d+\s+\d+\s+(\d+%)/'
after_script:
+ - docker ps -a
- docker rm -f $IMAGE_NAME
- docker rm -f kafka
#- docker rm -f zookeeper
diff --git a/src/monitoring/requirements.in b/src/monitoring/requirements.in
index 326b20ff5..aebbb2684 100644
--- a/src/monitoring/requirements.in
+++ b/src/monitoring/requirements.in
@@ -26,7 +26,7 @@ numpy<2.0.0
influx-line-protocol==0.1.4
python-dateutil==2.8.2
python-json-logger==2.0.2
-#pytz==2021.3
+pytz
#redis==4.1.2
requests==2.27.1
xmltodict==0.12.0
diff --git a/src/telemetry/backend/requirements.in b/src/telemetry/backend/requirements.in
index e7ca6546c..828cd0330 100644
--- a/src/telemetry/backend/requirements.in
+++ b/src/telemetry/backend/requirements.in
@@ -16,3 +16,4 @@ anytree==2.8.0
APScheduler>=3.10.4
confluent-kafka==2.3.*
numpy==2.0.1
+pytz>=2025.2
diff --git a/src/telemetry/requirements.in b/src/telemetry/requirements.in
index 1b329093d..95ba72010 100644
--- a/src/telemetry/requirements.in
+++ b/src/telemetry/requirements.in
@@ -16,5 +16,5 @@ APScheduler>=3.10.4
psycopg2-binary==2.9.3
python-dateutil==2.8.2
python-json-logger==2.0.2
-pytz==2024.1
+pytz>=2025.2
requests==2.27.1
--
GitLab