Skip to content

Commit

Permalink
Merge pull request #850 from barakda/atom_cleanup_improve_and_sha_update
Browse files Browse the repository at this point in the history
atom stabilization issues fix
  • Loading branch information
barakda committed Sep 4, 2024
2 parents 3966c06 + 963f3ac commit f64e3be
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ CEPH_SHA=b59673c44bd569f9f3db37f87bced695dec5fcbf
CEPH_DEVEL_MGR_PATH=../ceph

# Atom
ATOM_SHA=3506b53e1da8a769f079d0b600899e45e513df34
ATOM_SHA=ea4461ac526d6b66ccf0f93d693aa31d929932ad

# Demo settings
RBD_POOL=rbd
Expand Down
16 changes: 12 additions & 4 deletions tests/atom/atomEnvInit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

ATOM_SHA=$1
ACTION_URL=$2
RUNNER_FILDER='/home/cephnvme/actions-runner-ceph'

cleanup_docker_images() {
local HOST=$1
Expand All @@ -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
Expand All @@ -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 [email protected]:NVME-Over-Fiber/ceph-nvmeof-atom.git
if [ $? -ne 0 ]; then
echo "Error: Failed to clone the atom repository."
Expand All @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion tests/atom/clusterBuildTestsRun.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit f64e3be

Please sign in to comment.