From 13c65f190765f4d8b8edca85d0c7d2cb3a70cd3f Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Mon, 11 Feb 2019 23:49:38 +0100 Subject: [PATCH] #1107 Hotfix --- Jenkinsfile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 28b06962e..8a27d0c26 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,8 +7,8 @@ pipeline { } environment { REGISTRY = 'registry.verdnatura.es' - DOCKER_HOST_1 = 'tcp://vch1.verdnatura.es:2376' - DOCKER_HOST_2 = 'tcp://vch2.verdnatura.es:2376' + DOCKER_HOST_1 = 'vch1.verdnatura.es' + DOCKER_HOST_2 = 'vch2.verdnatura.es' TAG = "${env.BRANCH_NAME}" } stages { @@ -94,7 +94,7 @@ pipeline { parallel { stage('Host 1') { environment { - DOCKER_HOST = "${env.DOCKER_HOST_1}" + DOCKER_HOST = "tcp://${env.DOCKER_HOST_1}:2376" } steps { withCredentials([dockerCert(credentialsId: 'docker', variable: 'DOCKER_CERT_PATH')]) { @@ -105,7 +105,7 @@ pipeline { } stage('Host 2') { environment { - DOCKER_HOST = "${env.DOCKER_HOST_2}" + DOCKER_HOST = "tcp://${env.DOCKER_HOST_2}:2376" } steps { withCredentials([dockerCert(credentialsId: 'docker', variable: 'DOCKER_CERT_PATH')]) { @@ -128,8 +128,10 @@ pipeline { post { always { script { - if (env.BRANCH_NAME == 'dev') + if (env.BRANCH_NAME == 'dev') { junit '*/junitresults.xml' + junit 'junitresults.xml' + } if (!env.GIT_COMMITTER_EMAIL) return try {