specifically use local variable for os distro

Author: weideng1

Jenkinsfile

@@ -1,8 +1,8 @@
 #!groovy
 import org.jenkinsci.plugins.workflow.steps.FlowInterruptedException
 
-def init_os_distro() {
-  env.OS_DISTRO = sh(label: 'Assign env.OS_DISTRO based on OS env', script: '''#!/bin/bash -le
+def get_os_distro() {
+  return sh(label: 'Assign env.OS_DISTRO based on OS env', script: '''#!/bin/bash -le
     echo ${OS_DISTRO}''', returnStdout: true).trim()
 }
 
@@ -550,8 +550,8 @@ pipeline {
             post {
               success {
                 // Allow empty results for 'osx/high-sierra' which doesn't produce packages
-                init_os_distro()
-                archiveArtifacts artifacts: "${env.OS_DISTRO}/**/libuv*", allowEmptyArchive: true
+                def distro = get_os_distro()
+                archiveArtifacts artifacts: "${distro}/**/libuv*", allowEmptyArchive: true
               }
             }
           }
@@ -561,14 +561,14 @@ pipeline {
             }
             post {
               success {
-                init_os_distro()
-                archiveArtifacts artifacts: "${env.OS_DISTRO}/**/cassandra-*-tests"
-                archiveArtifacts artifacts: "${env.OS_DISTRO}/**/dse-*-tests", allowEmptyArchive: true
+                def distro = get_os_distro()
+                archiveArtifacts artifacts: "${distro}/**/cassandra-*-tests"
+                archiveArtifacts artifacts: "${distro}/**/dse-*-tests", allowEmptyArchive: true
               }
               failure {
-                init_os_distro()
-                archiveArtifacts artifacts: "${env.OS_DISTRO}/**/CMakeOutput.log"
-                archiveArtifacts artifacts: "${env.OS_DISTRO}/**/CMakeError.log"
+                def distro = get_os_distro()
+                archiveArtifacts artifacts: "${distro}/**/CMakeOutput.log"
+                archiveArtifacts artifacts: "${distro}/**/CMakeError.log"
               }
             }
           }
@@ -598,8 +598,8 @@ pipeline {
             }
             post {
               success {
-                init_os_distro()
-                archiveArtifacts artifacts: "${env.OS_DISTRO}/**/*-cpp-driver*"
+                def distro = get_os_distro()
+                archiveArtifacts artifacts: "${distro}/**/*-cpp-driver*"
               }
             }
           }
@@ -757,9 +757,9 @@ pipeline {
             }
             post {
               failure {
-                init_os_distro()
-                archiveArtifacts artifacts: "${env.OS_DISTRO}/**/CMakeOutput.log"
-                archiveArtifacts artifacts: "${env.OS_DISTRO}/**/CMakeError.log"
+                def distro = get_os_distro()
+                archiveArtifacts artifacts: "${distro}/**/CMakeOutput.log"
+                archiveArtifacts artifacts: "${distro}/**/CMakeError.log"
               }
             }
           }
@@ -774,8 +774,8 @@ pipeline {
                 junit testResults: '*integration-tests-*-results.xml', allowEmptyResults: true
               }
               failure {
-                init_os_distro()
-                archiveArtifacts artifacts: "${env.OS_DISTRO}/**/*-integration-tests-driver-logs.tgz"
+                def distro = get_os_distro()
+                archiveArtifacts artifacts: "${distro}/**/*-integration-tests-driver-logs.tgz"
               }
               cleanup {
                 cleanWs()