try to lower nodeLabel, fix typo

Signed-off-by: Bruce Kropp <[email protected]>
NOAA-EPIC · Dec 10, 2024 · b082520 · b082520
1 parent 20f10e3
commit b082520
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.cicd/Jenkinsfile b/.cicd/Jenkinsfile
@@ -29,17 +29,20 @@ def generateStage(nodeLabel) {
                 cleanWs()
                 checkout scm
 		script {
-			echo "UFS_PLATFORM=${env.UFS_PLAFTORM} UFS_COMPILER=${env.UFS_COMPILER}"
+			echo "UFS_PLATFORM=${env.UFS_PLATFORM} UFS_COMPILER=${env.UFS_COMPILER}"
                         sh 'bash --login "${WORKSPACE}/.cicd/scripts/wm_init.sh"'
                         sh "STAGE_NAME='${env.STAGE_NAME}' " + 'bash --login "${WORKSPACE}/.cicd/scripts/disk_usage.sh"'
 			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: "${NODE_NAME}-*-time-wm_init.json", storageClass: 'STANDARD', uploadFromSlave: false, useServerSideEncryption: false]], pluginFailureResultConstraint: 'FAILURE', profileName: 'main', userMetadata: []
-			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: "${NODE_NAME}-*-disk-usageInit*.csv", storageClass: 'STANDARD', uploadFromSlave: false, useServerSideEncryption: false]], pluginFailureResultConstraint: 'FAILURE', profileName: 'main', userMetadata: []
+			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: "${env.UFS_PLATFORM}-*-disk-usageInit*.csv", storageClass: 'STANDARD', uploadFromSlave: false, useServerSideEncryption: false]], pluginFailureResultConstraint: 'FAILURE', profileName: 'main', userMetadata: []
 		}
             }
         }
         stage("Build on ${nodeLabel}") {
 	    if (params.WM_BUILD == true ) {
                 node(nodeLabel) {
+		environment {
+			UFS_PLATFORM = nodeLabel.toLowerCase()
+		}
 		    script {
                         currentBuild.displayName = "#${BUILD_NUMBER} ${nodeLabel} ${UFS_COMPILER}"
                         currentBuild.description = "build ${NODE_NAME}/${UFS_COMPILER}"

diff --git a/.cicd/scripts/disk_usage.sh b/.cicd/scripts/disk_usage.sh
@@ -10,6 +10,8 @@
 #    size=$3
 #    outfile=$4
 
+export UFS_PLATFORM=${UFS_PLATFORM:-${NODE_NAME,,}}
+export UFS_COMPILER=${UFS_COMPILER:-intel}
 [[ -n ${WORKSPACE} ]] || WORKSPACE="$(pwd)"
 [[ -n ${UFS_PLATFORM} ]] || UFS_PLATFORM="$(hostname -s 2>/dev/null)" || UFS_PLATFORM="$(hostname 2>/dev/null)"
 [[ -n ${UFS_COMPILER} ]] || UFS_COMPILER="compiler"
@@ -25,7 +27,7 @@ else
     workspace="$(cd -- "${script_dir}/../.." && pwd)"
 fi
 
-echo "STAGE_NAME=${STAGE_NAME}" # from pipeline
+echo "STAGE_NAME=${STAGE_NAME%% *}" # from pipeline
 outfile="${4:-${workspace}-${UFS_COMPILER}-disk-usage${STAGE_NAME%% *}.csv}"
 
 function disk_usage() {