Merge branch 'dev' of juan/salix into dev

2019-02-17 18:50:00 +00:00 · 2019-02-17 18:50:00 +00:00 · 56bc860fa0
parent 041a423102 98a62bed2d
commit 56bc860fa0
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -135,7 +135,7 @@ pipeline {
    post {
        always {
            script {
-                if (env.BRANCH_NAME == 'dev') {
+                if (!['master', 'test'].contains(env.BRANCH_NAME)) {
                    try {
                        junit '*/junitresults.xml'
                        junit 'junitresults.xml'