From 5a48a863d2b857823593d5983bebb677907bfd09 Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Fri, 21 Jun 2019 11:33:55 +0200 Subject: [PATCH] openvidu-test-e2e: Jenkinsfile remove stranded containers --- openvidu-test-e2e/jenkins/Jenkinsfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/openvidu-test-e2e/jenkins/Jenkinsfile b/openvidu-test-e2e/jenkins/Jenkinsfile index cc6b2ebf..5736c276 100644 --- a/openvidu-test-e2e/jenkins/Jenkinsfile +++ b/openvidu-test-e2e/jenkins/Jenkinsfile @@ -1,13 +1,16 @@ node('container') { + stage('Containers clean up') { + sh 'docker rm -f chrome firefox e2e' + } docker.image('selenium/standalone-chrome:latest').pull() docker.image('selenium/standalone-firefox:latest').pull() - docker.image('selenium/standalone-chrome:latest').withRun('-p 4444:4444 --shm-size=1g -v /opt/openvidu:/opt/openvidu') { c -> + docker.image('selenium/standalone-chrome:latest').withRun('-p 4444:4444 --name chrome --shm-size=1g -v /opt/openvidu:/opt/openvidu') { c -> sh 'rm -rf /opt/openvidu/barcode.* && wget https://github.com/OpenVidu/openvidu/raw/master/openvidu-test-e2e/docker/barcode.y4m -P /opt/openvidu' sh 'rm -rf /opt/openvidu/fakeaudio.* && wget https://github.com/OpenVidu/openvidu/raw/master/openvidu-test-e2e/docker/fakeaudio.wav -P /opt/openvidu' - docker.image('selenium/standalone-firefox:latest').withRun('-p 4445:4444 --shm-size=1g') { d -> + docker.image('selenium/standalone-firefox:latest').withRun('-p 4445:4444 --name firefox --shm-size=1g') { d -> def mycontainer = docker.image('openvidu/openvidu-test-e2e:$DISTRO') mycontainer.pull() - mycontainer.inside("-p 4200:4200 -p 4443:4443 -u root -e MY_UID=0 -v /var/run/docker.sock:/var/run/docker.sock:rw -v /dev/shm:/dev/shm -v /opt/openvidu:/opt/openvidu") { + mycontainer.inside("--name e2e -p 4200:4200 -p 4443:4443 -u root -e MY_UID=0 -v /var/run/docker.sock:/var/run/docker.sock:rw -v /dev/shm:/dev/shm -v /opt/openvidu:/opt/openvidu") { stage('Preparation') { sh 'rm -rf ~/.m2 || true' sh 'rm -rf openvidu || true'