From 963f3acf4f84bd2893eda482b52dca530c0dd8a7 Mon Sep 17 00:00:00 2001
From: barakda <barak.davidov@gmail.com>
Date: Wed, 4 Sep 2024 13:01:53 +0300
Subject: [PATCH] atom stabilization issues fix

Signed-off-by: barakda <barak.davidov@gmail.com>
---
 .env                               |  2 +-
 tests/atom/atomEnvInit.sh          | 16 ++++++++++++----
 tests/atom/clusterBuildTestsRun.sh |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.env b/.env
index 97cbb65b..0af1313a 100644
--- a/.env
+++ b/.env
@@ -71,7 +71,7 @@ CEPH_SHA=b59673c44bd569f9f3db37f87bced695dec5fcbf
 CEPH_DEVEL_MGR_PATH=../ceph
 
 # Atom
-ATOM_SHA=3506b53e1da8a769f079d0b600899e45e513df34
+ATOM_SHA=ea4461ac526d6b66ccf0f93d693aa31d929932ad
 
 # Demo settings
 RBD_POOL=rbd
diff --git a/tests/atom/atomEnvInit.sh b/tests/atom/atomEnvInit.sh
index db37aa0e..833857ac 100755
--- a/tests/atom/atomEnvInit.sh
+++ b/tests/atom/atomEnvInit.sh
@@ -2,6 +2,7 @@
 
 ATOM_SHA=$1
 ACTION_URL=$2
+RUNNER_FILDER='/home/cephnvme/actions-runner-ceph'
 
 cleanup_docker_images() {
     local HOST=$1
@@ -15,7 +16,7 @@ EOF
 }
 
 # Remove previous run data
-rm -rf /home/cephnvme/actions-runner-ceph/ceph-nvmeof-atom
+rm -rf $RUNNER_FILDER/ceph-nvmeof-atom
 sudo rm -rf /root/.ssh/atom_backup/artifact/multiIBMCloudServers_m2/*
 
 # Check if cluster is busy with another run
@@ -35,7 +36,7 @@ done
 sudo docker ps -q | xargs -r sudo docker stop; sudo docker ps -q | xargs -r sudo docker rm -f; sudo yes | docker system prune -fa; docker ps; docker images
 
 # Cloning atom repo
-cd /home/cephnvme/actions-runner-ceph
+cd $RUNNER_FILDER
 git clone git@github.ibm.com:NVME-Over-Fiber/ceph-nvmeof-atom.git
 if [ $? -ne 0 ]; then
     echo "Error: Failed to clone the atom repository."
@@ -51,7 +52,7 @@ if [ $? -ne 0 ]; then
 fi
 
 # Build atom images based on the cloned repo
-docker build -t nvmeof_atom:$ATOM_SHA /home/cephnvme/actions-runner-ceph/ceph-nvmeof-atom
+docker build -t nvmeof_atom:$ATOM_SHA $RUNNER_FILDER/ceph-nvmeof-atom
 if [ $? -ne 0 ]; then
     echo "Error: Failed to build Docker image."
     exit 1
@@ -74,4 +75,11 @@ for HOST in "${HOSTS[@]}"; do
     fi
 done
 
-sudo podman ps -q | xargs -r sudo podman stop; sudo podman ps -q | xargs -r sudo podman rm -f; sudo yes | podman system prune -fa; podman ps; podman images
+echo "Cleaning up Podman containers and images on installer"
+sudo podman ps -q | xargs -r sudo podman stop
+sudo podman ps -q | xargs -r sudo podman rm -f
+sudo podman rmi -f $(sudo podman images -q)
+sudo yes | podman system prune -fa
+echo "show exist podman images/containers (should be empty)"
+sudo podman ps
+sudo podman images
\ No newline at end of file
diff --git a/tests/atom/clusterBuildTestsRun.sh b/tests/atom/clusterBuildTestsRun.sh
index 3d29ad5e..457f69a3 100755
--- a/tests/atom/clusterBuildTestsRun.sh
+++ b/tests/atom/clusterBuildTestsRun.sh
@@ -27,7 +27,7 @@ sudo docker run \
     quay.ceph.io/ceph-ci/ceph:"$CEPH_SHA" \
     quay.io/ceph/nvmeof:"$VERSION" \
     quay.io/ceph/nvmeof-cli:"$VERSION" \
-    None None None None None None 4 1 1 2 4 1024 2 2 200M 0 1 20 \
+    None None None None None None 4 1 1 2 4 1024 2 2 200M 0 1 20 20 1 \
     --stopNvmeofDaemon \
     --stopNvmeofSystemctl \
     --stopMonLeader \