From 36127476ae049d82b843ef34577a330a34c82c61 Mon Sep 17 00:00:00 2001
From: "adheli.tavares" <adheli.tavares@est.tech>
Date: Tue, 2 Jul 2024 11:51:35 +0100
Subject: Fixes for CSIT

- fix API tests from changes in code coverage / sonar fixes
- fix some env variables in docker compose
- stick jaeger version for compatibility

Issue-ID: POLICY-5067
Change-Id: I48d05f54bfba0ca2e259428c4f8e83047ef42a18
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
---
 compose/config/pap/papParameters.yaml | 1 -
 compose/docker-compose.yml            | 2 +-
 compose/start-compose.sh              | 3 +++
 compose/stop-compose.sh               | 6 ++++--
 4 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'compose')

diff --git a/compose/config/pap/papParameters.yaml b/compose/config/pap/papParameters.yaml
index 51aaec38..5b6c640e 100644
--- a/compose/config/pap/papParameters.yaml
+++ b/compose/config/pap/papParameters.yaml
@@ -27,7 +27,6 @@ server:
 
 pap:
   name: PapGroup
-  aaf: false
   topic:
     pdp-pap.name: policy-pdp-pap
     notification.name: policy-notification
diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml
index d5a2cc78..49c63779 100644
--- a/compose/docker-compose.yml
+++ b/compose/docker-compose.yml
@@ -500,7 +500,7 @@ services:
       TEST_ENV: ${TEST_ENV}
 
   jaeger:
-    image: jaegertracing/all-in-one:latest
+    image: jaegertracing/all-in-one:1.58
     container_name: jaeger
     ports:
       - 4318:4318
diff --git a/compose/start-compose.sh b/compose/start-compose.sh
index a5da09d8..a6ada298 100755
--- a/compose/start-compose.sh
+++ b/compose/start-compose.sh
@@ -72,6 +72,9 @@ if [ -z "$ROBOT_LOG_DIR" ]; then
   export ROBOT_LOG_DIR=/tmp/
 fi
 
+# always 'docker' if running docker compose
+export TEST_ENV="docker"
+
 if [ -n "$component" ]; then
   if [ "$component" == "logs" ]; then
   echo "Collecting logs..."
diff --git a/compose/stop-compose.sh b/compose/stop-compose.sh
index 013fbe1e..809c8f47 100755
--- a/compose/stop-compose.sh
+++ b/compose/stop-compose.sh
@@ -24,6 +24,9 @@ if [ -z "${WORKSPACE}" ]; then
     export WORKSPACE
 fi
 
+# always 'docker' if running docker compose
+export TEST_ENV="docker"
+
 # docker compose fails when not running CSIT
 if [ -z "$ROBOT_LOG_DIR" ]; then
   export ROBOT_LOG_DIR=/tmp/
@@ -51,11 +54,10 @@ do
         echo "======== Logs from ${item} ========" >> docker_compose.log
         docker compose logs $item >> docker_compose.log
         echo "===================================" >> docker_compose.log
+        echo "" >> docker_compose.log
     fi
 done
 
-cat docker_compose.log
-
 echo "Tearing down containers..."
 docker compose down -v --remove-orphans
 
-- 
cgit 1.2.3-korg