From 5936066e622d41d2c5d674a66e2b00dec13c3c12 Mon Sep 17 00:00:00 2001
From: Damon Atkins <damon-atkins@users.noreply.github.com>
Date: Fri, 30 Nov 2018 23:36:07 +1100
Subject: [PATCH] ensure archiveArtifacts are always collected. Use
 CHANGE_BRANCH to detect merge-forward

---
 .ci/lint | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.ci/lint b/.ci/lint
index 41206071efbc..2ee375f1954b 100644
--- a/.ci/lint
+++ b/.ci/lint
@@ -60,7 +60,6 @@ pipeline {
                         read rc_exit < pylint-salt-chg.exit
                         exit "$rc_exit"
                         '''
-                        archiveArtifacts artifacts: 'pylint-report-salt-chg.log'
                     }
                 }
                 stage('lint test chg') {
@@ -77,16 +76,16 @@ pipeline {
                         read rc_exit < pylint-tests-chg.exit
                         exit "$rc_exit"
                         '''
-                        archiveArtifacts artifacts: 'pylint-report-tests-chg.log'
                     }
                 }
             }
             post {
                 always {
+                    archiveArtifacts artifacts: 'pylint-report-*-chg.log', allowEmptyArchive: true
                     step([$class: 'WarningsPublisher',
                         parserConfigurations: [[
                             parserName: 'PyLint',
-                            pattern: 'pylint-report*chg.log'
+                            pattern: 'pylint-report-*-chg.log'
                         ]],
                         failedTotalAll: '0',
                         useDeltaValues: false,
@@ -99,7 +98,7 @@ pipeline {
         stage('linting all') {
             // perform a full linit if this is a merge forward and the change only lint passed.
             when {
-                expression { return params.BRANCH_NAME =~ /(?i)^merge-/ }
+                expression { return params.CHANGE_BRANCH =~ /(?i)^merge[._-]/ }
             }
             parallel {
                 stage('setup full') {
@@ -120,7 +119,6 @@ pipeline {
                         read rc_exit <  pylint-salt-full.exit
                         exit "$rc_exit"
                         '''
-                        archiveArtifacts artifacts: 'pylint-report-salt-full.log'
                     }
                 }
                 stage('lint test full') {
@@ -133,16 +131,16 @@ pipeline {
                         read rc_exit <  pylint-tests-full.exit
                         exit "$rc_exit"
                         '''
-                        archiveArtifacts artifacts: 'pylint-report-tests-full.log'
                     }
                 }
             }
             post {
                 always {
+                    archiveArtifacts artifacts: 'pylint-report-*-full.log', allowEmptyArchive: true
                     step([$class: 'WarningsPublisher',
                         parserConfigurations: [[
                             parserName: 'PyLint',
-                            pattern: 'pylint-report*full.log'
+                            pattern: 'pylint-report-*-full.log'
                         ]],
                         failedTotalAll: '0',
                         useDeltaValues: false,