Jenkinsfile: improved removeStrandedContainers

openvidu-test-e2e/jenkins/Jenkinsfile

@@ -165,6 +165,7 @@ node('container') {
             currentBuild.result = 'FAILURE'
           } finally {
             environmentStop()
+            commonFunctions.removeStrandedContainers(false)
           }
         }
       }

openvidu-test-e2e/jenkins/commonFunctions.groovy

@@ -21,7 +21,7 @@ def prepareTestingEnvironment() {
             sh 'sudo rm -rf /opt/openvidu-cache/.m2/repository/org/kurento || true'
         },
         'Removing stranded containers': {
-            removeStrandedContainers()
+            removeStrandedContainers(true)
         }
     )
 
@@ -84,12 +84,12 @@ def prepareTestingEnvironment() {
     )
 }
 
-def removeStrandedContainers() {
+def removeStrandedContainers(removeTestingContainers) {
     println('Removing stranded containers')
+    script {
+        env.removeTestingContainers = removeTestingContainers
         sh(script: '''#!/bin/bash -xe
-        declare -a arr=("openvidu/openvidu-test-e2e:"
+            declare -a arr=("selenium/standalone-chrome:"
-                        "openvidu/openvidu-pro-test-e2e:"
-                        "selenium/standalone-chrome:"
                             "selenium/standalone-firefox:"
                             "selenium/standalone-opera:"
                             "openvidu/mediasoup-controller:"
@@ -105,11 +105,17 @@ def removeStrandedContainers() {
                             "openvidu/openvidu-pro-dind-media-node:"
                             "kurento/kurento-media-server:"
                             "openvidu/media-node-controller:")
+            if [ "${removeTestingContainers}" == "true" ]; then
+                arr+=("openvidu/openvidu-test-e2e:")
+                arr+=("openvidu/openvidu-pro-test-e2e:")
+            fi
             for image in "${arr[@]}"
             do
                 docker ps -a | awk '{ print $1,$2 }' | grep "${image}" | awk '{ print $1 }' | xargs -I {} docker rm -f {}
             done
+            docker ps -a
         '''.stripIndent())
+    }
 }
 
 return this