From ba52b18970210929eee36f394de8dfcbc29c88ff Mon Sep 17 00:00:00 2001
From: Barak Davidov <barakda@il.ibm.com>
Date: Sun, 1 Dec 2024 18:12:41 +0200
Subject: [PATCH] prep release 1.4.1

Signed-off-by: Barak Davidov <barakda@il.ibm.com>
---
 tests/atom/clusterBuildTestsRun.sh | 45 +++++++++++-------------------
 1 file changed, 16 insertions(+), 29 deletions(-)

diff --git a/tests/atom/clusterBuildTestsRun.sh b/tests/atom/clusterBuildTestsRun.sh
index 7d06aa9a8..05f5922c2 100755
--- a/tests/atom/clusterBuildTestsRun.sh
+++ b/tests/atom/clusterBuildTestsRun.sh
@@ -48,33 +48,16 @@ git checkout $ATOM_SHA
 # Build atom images based on the cloned repo
 docker build -t nvmeof_atom:$ATOM_SHA .
 
-# Atom test script run
-#   Description of the uncleared flags with their default values
-#   - Upgrade ceph image target (None)
-#   - Upgrade nvmeof image target (None)
-#   - Nvmeof cli image use in target (None)
-#   - Number of gateways (4)
-#   - Number of gateways to stop (1)
-#   - Number of gateways after scale down (1)
-#   - Number of subsystems (2)
-#   - Number of namespaces (4)
-#   - Max namespaces per subsystem (1024)
-#   - HA failover cycles (2)
-#   - HA failover cycles after upgrade (2)
-#   - RBD size (200M)
-#   - Seed number (0)
-#   - FIO use (1=run fio, 0=don't run fio)
-
 set -x
 if [ "$5" != "nightly" ]; then
-    sudo docker run \
+    DOCKER_COMMAND="sudo docker run \
         -v /root/.ssh:/root/.ssh \
-        nvmeof_atom:"$ATOM_SHA" \
+        nvmeof_atom:\"$ATOM_SHA\" \
         python3 atom.py \
         --project=nvmeof \
-        --ceph-img=quay.ceph.io/ceph-ci/ceph:"$CEPH_SHA" \
-        --gw-img=quay.io/ceph/nvmeof:"$VERSION" \
-        --cli-img=quay.io/ceph/nvmeof-cli:"$VERSION" \
+        --ceph-img=quay.ceph.io/ceph-ci/ceph:\"$CEPH_SHA\" \
+        --gw-img=quay.io/ceph/nvmeof:\"$VERSION\" \
+        --cli-img=quay.io/ceph/nvmeof-cli:\"$VERSION\" \
         --initiators=1 \
         --gw-group-num=1 \
         --gw-num=4 \
@@ -101,16 +84,16 @@ if [ "$5" != "nightly" ]; then
         --skip-lb-test \
         --journalctl-to-console \
         --dont-power-off-cloud-vms \
-        --env=m6
+        --env=m6"
 else
-    sudo docker run \
+    DOCKER_COMMAND="sudo docker run \
         -v /root/.ssh:/root/.ssh \
-        nvmeof_atom:"$ATOM_SHA" \
+        nvmeof_atom:\"$ATOM_SHA\" \
         python3 atom.py \
         --project=nvmeof \
-        --ceph-img=quay.ceph.io/ceph-ci/ceph:"$CEPH_SHA" \
-        --gw-img=quay.io/ceph/nvmeof:"$VERSION" \
-        --cli-img=quay.io/ceph/nvmeof-cli:"$VERSION" \
+        --ceph-img=quay.ceph.io/ceph-ci/ceph:\"$CEPH_SHA\" \
+        --gw-img=quay.io/ceph/nvmeof:\"$VERSION\" \
+        --cli-img=quay.io/ceph/nvmeof-cli:\"$VERSION\" \
         --initiators=1 \
         --gw-group-num=1 \
         --gw-num=4 \
@@ -138,6 +121,10 @@ else
         --journalctl-to-console \
         --dont-power-off-cloud-vms \
         --dont-use-hugepages \
-        --env=m6
+        --env=m6"
 fi
+
+echo "Running Docker Command:"
+echo "$DOCKER_COMMAND"
+eval "$DOCKER_COMMAND"
 set +x