From e867e7963d2626448cb1e930574c86d0573d6756 Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Tue, 26 Oct 2021 15:21:08 +0200 Subject: [PATCH] Jenkinsfile: check env variables instead of parameterizing them --- openvidu-test-e2e/jenkins/Jenkinsfile | 2 +- openvidu-test-e2e/jenkins/commonFunctions.groovy | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/openvidu-test-e2e/jenkins/Jenkinsfile b/openvidu-test-e2e/jenkins/Jenkinsfile index 1216e658..cf01dfbd 100644 --- a/openvidu-test-e2e/jenkins/Jenkinsfile +++ b/openvidu-test-e2e/jenkins/Jenkinsfile @@ -2,7 +2,7 @@ node('container') { // Load and execute common functions Groovy script sh 'curl -O https://raw.githubusercontent.com/OpenVidu/openvidu/master/openvidu-test-e2e/jenkins/commonFunctions.groovy' def commonFunctions = load 'commonFunctions.groovy' - commonFunctions.prepareTestingEnvironment("${DISTRO}", "${MEDIASOUP_CONTROLLER_DOCKER_VERSION}") + commonFunctions.prepareTestingEnvironment() // Clone and checkout OpenVidu/openvidu repository def commitId = "${OPENVIDU_COMMIT}" diff --git a/openvidu-test-e2e/jenkins/commonFunctions.groovy b/openvidu-test-e2e/jenkins/commonFunctions.groovy index 4ce36787..c4b4b586 100644 --- a/openvidu-test-e2e/jenkins/commonFunctions.groovy +++ b/openvidu-test-e2e/jenkins/commonFunctions.groovy @@ -1,5 +1,5 @@ #!groovy -def prepareTestingEnvironment(def DISTRO, def MEDIASOUP_CONTROLLER_DOCKER_VERSION) { +def prepareTestingEnvironment() { println('Deleting folder /opt/openvidu') sh 'sudo rm -rf /opt/openvidu/* || true' @@ -41,10 +41,14 @@ def prepareTestingEnvironment(def DISTRO, def MEDIASOUP_CONTROLLER_DOCKER_VERSIO println('Pulling containers') parallel ( 'Pull openvidu/openvidu-test-e2e': { - docker.image('openvidu/openvidu-test-e2e:$DISTRO').pull() + if (env.DISTRO) { + docker.image('openvidu/openvidu-test-e2e:$DISTRO').pull() + } }, 'Pull openvidu/openvidu-pro-test-e2e': { - docker.image('openvidu/openvidu-pro-test-e2e:$DISTRO').pull() + if (env.DISTRO) { + docker.image('openvidu/openvidu-pro-test-e2e:$DISTRO').pull() + } }, 'Pull selenium/standalone-chrome': { docker.image('selenium/standalone-chrome:latest').pull() @@ -56,7 +60,9 @@ def prepareTestingEnvironment(def DISTRO, def MEDIASOUP_CONTROLLER_DOCKER_VERSIO docker.image('selenium/standalone-opera:latest').pull() }, 'Pull openvidu/mediasoup-controller': { - docker.image('openvidu/mediasoup-controller:$MEDIASOUP_CONTROLLER_DOCKER_VERSION').pull() + if (env.MEDIASOUP_CONTROLLER_DOCKER_VERSION) { + docker.image('openvidu/mediasoup-controller:$MEDIASOUP_CONTROLLER_DOCKER_VERSION').pull() + } } )