Skip to content

Commit 3b45b80

Browse files
use environment vars in post script
Signed-off-by: epic-cicd-jenkins <ecc.platform@noaa.gov>
1 parent ce090f4 commit 3b45b80

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.cicd/Jenkinsfile

+5-2
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,12 @@ def generateStage(nodeLabel) {
6666
}
6767
else {
6868
sh "WM_CREATE_BASELINE=false " + 'bash --login "${WORKSPACE}/.cicd/scripts/wm_test.sh"'
69+
sh '''
70+
${WORKSPACE}/.cicd/scripts/post_test_results.sh ${NODE_NAME} RT
71+
'''
6972
}
7073
s3Upload consoleLogLevel: 'INFO', dontSetBuildResultOnFailure: false, dontWaitForConcurrentBuildCompletion: false, entries: [[bucket: 'noaa-epic-prod-jenkins-artifacts', excludedFile: '', flatten: true, gzipFiles: false, keepForever: false, managedArtifacts: true, noUploadOnFailure: false, selectedRegion: 'us-east-1', showDirectlyInBrowser: false, sourceFile: "**/*tgz*", storageClass: 'STANDARD', uploadFromSlave: false, useServerSideEncryption: false]], pluginFailureResultConstraint: 'FAILURE', profileName: 'main', userMetadata: []
71-
s3Upload consoleLogLevel: 'INFO', dontSetBuildResultOnFailure: false, dontWaitForConcurrentBuildCompletion: false, entries: [[bucket: 'noaa-epic-prod-jenkins-artifacts', excludedFile: '', flatten: false, gzipFiles: false, keepForever: false, managedArtifacts: true, noUploadOnFailure: false, selectedRegion: 'us-east-1', showDirectlyInBrowser: false, sourceFile: "tests/wm_test_results-*-*.txt", storageClass: 'STANDARD', uploadFromSlave: false, useServerSideEncryption: false]], pluginFailureResultConstraint: 'FAILURE', profileName: 'main', userMetadata: []
74+
s3Upload consoleLogLevel: 'INFO', dontSetBuildResultOnFailure: false, dontWaitForConcurrentBuildCompletion: false, entries: [[bucket: 'noaa-epic-prod-jenkins-artifacts', excludedFile: '', flatten: false, gzipFiles: false, keepForever: false, managedArtifacts: true, noUploadOnFailure: false, selectedRegion: 'us-east-1', showDirectlyInBrowser: false, sourceFile: "./wm_test_results-*-*.txt", storageClass: 'STANDARD', uploadFromSlave: false, useServerSideEncryption: false]], pluginFailureResultConstraint: 'FAILURE', profileName: 'main', userMetadata: []
7275
}
7376
catch(err) {
7477
sh '''
@@ -111,7 +114,7 @@ def generateStage(nodeLabel) {
111114
sh 'bash --login "${WORKSPACE}/.cicd/scripts/post_test_results.sh ${NODE_NAME} BL"'
112115
}
113116
else {
114-
sh 'bash --login "${WORKSPACE}/.cicd/scripts/post_test_results.sh ${NODE_NAME} RT"'
117+
sh "WM_TEST_LABEL=RT " + 'bash --login "${WORKSPACE}/.cicd/scripts/post_test_results.sh"'
115118
}
116119
}
117120
catch(err) {

.cicd/scripts/post_test_results.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/bash -x
22
# RT - RegressionTest label
3-
# BL - Baselins label
3+
# BL - Baseline label
44

55
export machine=${1:-${NODE_NAME}}
6-
label=$2
6+
label=${2:-${WM_TEST_LABEL}}
77
[[ -n "${label}" ]] || exit 1
88

99
export PATH=${PATH}:~/bin

0 commit comments

Comments
 (0)