update container cleanup

redhat-performance · Feb 14, 2024 · 8e38a61 · 8e38a61
1 parent ecdc407
commit 8e38a61
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/jenkins/PerfCI_OpenShift_Deployment/Jenkinsfile b/jenkins/PerfCI_OpenShift_Deployment/Jenkinsfile
@@ -33,12 +33,13 @@ pipeline {
                             sudo podman rmi -f $(sudo podman images -q quay.io/ebattat/benchmark-runner 2> /dev/null)
                         fi
                     '''
-                    sh 'sudo podman volume ls -q | sudo xargs -r podman volume rm'
+                    # containers cleanup: must be done for Jetlag containers and also to avoid reaching to container storage leak
+                    sh 'podman ps | awk '{print $1}' | xargs -I % podman stop %; podman ps -a | awk '{print $1}' | xargs -I % podman rm %; podman pod ps | awk '{print $1}' | xargs -I % podman pod rm % 2>&1'
                 }
             }
         }
 
-                stage('⚙️ SET SSH key') {
+        stage('⚙️ SET SSH key') {
             steps {
                 script {
                     sh 'mkdir -p $WORKSPACE/.ssh/'
@@ -113,7 +114,6 @@ END
                         sudo podman rmi -f $(sudo podman images -q quay.io/ebattat/benchmark-runner 2> /dev/null)
                     fi
                 '''
-                sh 'sudo podman volume ls -q | sudo xargs -r podman volume rm'
             }
         }
         failure {

diff --git a/jenkins/PerfCI_Operators_Deployment/Jenkinsfile b/jenkins/PerfCI_Operators_Deployment/Jenkinsfile
@@ -32,7 +32,6 @@ pipeline {
                             sudo podman rmi -f $(sudo podman images -q quay.io/ebattat/benchmark-runner 2> /dev/null)
                         fi
                     '''
-                    sh 'sudo podman volume ls -q | sudo xargs -r podman volume rm'
                 }
             }
         }
@@ -137,7 +136,6 @@ END
                         sudo podman rmi -f $(sudo podman images -q quay.io/ebattat/benchmark-runner 2> /dev/null)
                     fi
                 '''
-                sh 'sudo podman volume ls -q | sudo xargs -r podman volume rm'
             }
         }
         failure {