Merge branch 'dev' of juan/salix into dev

2019-02-18 07:49:44 +00:00 · 2019-02-18 07:49:44 +00:00 · 2fc36e1f40
parent 5eb4eb2e79 f56043e786
commit 2fc36e1f40
1 changed files with 4 additions and 6 deletions
--- a/10
+++ b/10
@ -36,9 +36,6 @@ pipeline {
                        case 'test':
                            env.NODE_ENV = 'test'
                            break
-                        default:
-                            env.NODE_ENV = 'development'
-                            break
                    }
                }
                echo "Committer: ${env.GIT_COMMITTER_EMAIL}"
@ -124,9 +121,10 @@ pipeline {
            }
        }
        stage('Cleanup') {
-            when {
-                not { branch 'dev' }
-            }
+            when { anyOf {
+                branch 'test'
+                branch 'master'
+            }}
            steps {
                sh 'docker logout $REGISTRY'
            }