verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity

#1107 Hotfix

This commit is contained in:
Juan Ferrer 2019-02-11 23:49:38 +01:00
parent c1586eeee4
commit 13c65f1907
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Jenkinsfile vendored
View File

@ -7,8 +7,8 @@ pipeline {
} }
environment { environment {
REGISTRY = 'registry.verdnatura.es' REGISTRY = 'registry.verdnatura.es'
DOCKER_HOST_1 = 'tcp://vch1.verdnatura.es:2376' DOCKER_HOST_1 = 'vch1.verdnatura.es'
DOCKER_HOST_2 = 'tcp://vch2.verdnatura.es:2376' DOCKER_HOST_2 = 'vch2.verdnatura.es'
TAG = "${env.BRANCH_NAME}" TAG = "${env.BRANCH_NAME}"
} }
stages { stages {
@ -94,7 +94,7 @@ pipeline {
parallel { parallel {
stage('Host 1') { stage('Host 1') {
environment { environment {
DOCKER_HOST = "${env.DOCKER_HOST_1}" DOCKER_HOST = "tcp://${env.DOCKER_HOST_1}:2376"
} }
steps { steps {
withCredentials([dockerCert(credentialsId: 'docker', variable: 'DOCKER_CERT_PATH')]) { withCredentials([dockerCert(credentialsId: 'docker', variable: 'DOCKER_CERT_PATH')]) {
@ -105,7 +105,7 @@ pipeline {
} }
stage('Host 2') { stage('Host 2') {
environment { environment {
DOCKER_HOST = "${env.DOCKER_HOST_2}" DOCKER_HOST = "tcp://${env.DOCKER_HOST_2}:2376"
} }
steps { steps {
withCredentials([dockerCert(credentialsId: 'docker', variable: 'DOCKER_CERT_PATH')]) { withCredentials([dockerCert(credentialsId: 'docker', variable: 'DOCKER_CERT_PATH')]) {
@ -128,8 +128,10 @@ pipeline {
post { post {
always { always {
script { script {
if (env.BRANCH_NAME == 'dev') if (env.BRANCH_NAME == 'dev') {
junit '*/junitresults.xml' junit '*/junitresults.xml'
junit 'junitresults.xml'
}
if (!env.GIT_COMMITTER_EMAIL) return if (!env.GIT_COMMITTER_EMAIL) return
try { try {