verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 55 Releases Wiki Activity

Merge branch 'dev' of https://git.verdnatura.es/salix into dev 

* 'dev' of https://git.verdnatura.es/salix:
  Jenkins error
  Jenkinsfile
This commit is contained in:
Carlos 2017-11-09 13:54:25 +01:00
parent 7223922251 8c3a5a7f6e
commit be45258b4c
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Jenkinsfile vendored
View File

@ -3,7 +3,6 @@
def branchName = "${env.BRANCH_NAME}"; def branchName = "${env.BRANCH_NAME}";
def branchProduction = "master" def branchProduction = "master"
def branchTest = "test"; def branchTest = "test";
def dockerHost = "${env.DOCKER_HOST}";
env.BRANCH_NAME = branchName; env.BRANCH_NAME = branchName;
env.TAG = "${env.BUILD_NUMBER}"; env.TAG = "${env.BUILD_NUMBER}";
@ -13,7 +12,7 @@ switch (branchName){
env.NODE_ENV = "development"; env.NODE_ENV = "development";
break; break;
case branchProduction: case branchProduction:
dockerHost = "tcp://172.16.255.29:2375"; env.DOCKER_HOST = "tcp://172.16.255.29:2375";
env.NODE_ENV = "production" env.NODE_ENV = "production"
break; break;
} }
@ -21,7 +20,7 @@ switch (branchName){
node node
{ {
stage ('Print environment variables'){ stage ('Print environment variables'){
echo "Branch ${branchName}, Build ${env.TAG}, NODE_ENV ${env.NODE_ENV} en docker Host ${dockerHost}" echo "Branch ${branchName}, Build ${env.TAG}, NODE_ENV ${env.NODE_ENV} en docker Host ${env.DOCKER_HOST}"
} }
stage ('Checkout') { stage ('Checkout') {
checkout scm checkout scm