From: halil.cakal <halil.cakal@est.tech>
Date: Fri, 31 Oct 2025 10:36:21 +0000 (+0000)
Subject: Fix: Write data job scenarios (small & large) k6 failures
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F36%2F142336%2F2;p=cps.git

Fix: Write data job scenarios (small & large) k6 failures

- After migrating from docker-compose to kubernetes deployment for
  regular test server, the write data jobs are failing because of
missing import
- To fix the issue, install the latest xk6-kafka automatically for any deployment type:
   docker-compose or kubernetes (previously it was automatically
installed for only docker-compose deployment)

Issue-ID: CPS-3028

Change-Id: I06419a4c068bd66448aa1e78d8df381e719f7b57
Signed-off-by: halil.cakal <halil.cakal@est.tech>
---

diff --git a/k6-tests/install-deps.sh b/k6-tests/install-deps.sh
index 2c4243e351..899a33275b 100755
--- a/k6-tests/install-deps.sh
+++ b/k6-tests/install-deps.sh
@@ -25,17 +25,10 @@ touch bin/.gitignore
 # Add it to the PATH, so downloaded versions will be used.
 export PATH="$(pwd)/bin:$PATH"
 
-# Download docker-compose.
-if [ ! -x bin/docker-compose ]; then
-  echo " Downloading docker-compose"
-  curl -s -L https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-linux-x86_64 > bin/docker-compose
-  chmod +x bin/docker-compose
-else
-  echo " docker-compose already installed"
-fi
-docker-compose version
+# The default deployment type is dockerCompose
+deploymentType=${1:-dockerHosts}
 
-# Download k6 with kafka extension.
+# Download k6 with kafka extension for any deployment type
 if [ ! -x bin/k6 ]; then
   echo " Installing k6 1.0.0 with kafka extension"
   curl -s -L https://github.com/mostafa/xk6-kafka/releases/download/v1.0.0/xk6-kafka_v1.0.0_linux_amd64.tar.gz | tar -xz
@@ -46,3 +39,15 @@ else
 fi
 echo " Checking k6 Version:"
 k6 --version
+
+# Download docker-compose for only dockerHosts
+if [ ! -x bin/docker-compose ] && [ "$deploymentType" = "dockerHosts" ]; then
+  echo " Downloading docker-compose"
+  curl -s -L https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-linux-x86_64 > bin/docker-compose
+  chmod +x bin/docker-compose
+else
+  echo " docker-compose already installed"
+fi
+docker-compose version
+
+
diff --git a/k6-tests/k6-main.sh b/k6-tests/k6-main.sh
index 2112fdeee7..c842d6ae73 100755
--- a/k6-tests/k6-main.sh
+++ b/k6-tests/k6-main.sh
@@ -42,13 +42,13 @@ trap on_exit EXIT SIGINT SIGTERM SIGQUIT
 
 pushd "$(dirname "$0")" || exit 1
 
+# Install needed dependencies for any deployment type
+source install-deps.sh "$deploymentType"
+
 # Handle deployment type specific setup
 if [[ "$deploymentType" == "dockerHosts" ]]; then
     echo "Test profile: $testProfile, and deployment type: $deploymentType provided for docker-compose cluster"
 
-    # Install needed dependencies for docker deployment
-    source install-deps.sh
-
     # Run setup for docker-compose environment
     ./setup.sh "$testProfile"