diff --git a/.cicd/Jenkinsfile b/.cicd/Jenkinsfile index c14d4087f2..2923beb93f 100644 --- a/.cicd/Jenkinsfile +++ b/.cicd/Jenkinsfile @@ -20,11 +20,8 @@ def generateStage(nodeLabel) { return { stage("Initialize on ${nodeLabel}") { node(nodeLabel) { - environment { - UFS_PLATFORM = "${env.NODE_NAME}" - } script { - currentBuild.displayName = "#${BUILD_NUMBER} ${env.UFS_PLATFORM}" + currentBuild.displayName = "#${BUILD_NUMBER} ${nodeLabel}" } cleanWs() checkout scm @@ -32,20 +29,16 @@ def generateStage(nodeLabel) { 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: "${env.UFS_PLATFORM}-*-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: "${env.UFS_PLATFORM}-*-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: "${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: [] } } stage("Build on ${nodeLabel}") { if (params.WM_BUILD == true ) { node(nodeLabel) { - environment { - UFS_PLATFORM = "${NODE_NAME}" - } script { currentBuild.displayName = "#${BUILD_NUMBER} ${nodeLabel} ${UFS_COMPILER}" - //currentBuild.description = "build ${UFS_PLATFORM}/${UFS_COMPILER}" + currentBuild.description = "build ${NODE_NAME}/${UFS_COMPILER}" echo "Building on ${nodeLabel}" sh 'bash --login "${WORKSPACE}/.cicd/scripts/wm_build.sh"'