From f9dd5e1e1ab68227f05ba0f94c4ba57cf5fb0fae Mon Sep 17 00:00:00 2001 From: Michael Lueken <63728921+MichaelLueken@users.noreply.github.com> Date: Fri, 13 Oct 2023 16:00:18 -0400 Subject: [PATCH] [develop] Add Sonarqube stage to the Jenkinsfile for PLATFORM-926 (#935) Added the Sonarqube stage to the Jenkinsfile in the SRW App's GitHub repository. Additionally, a fix has been made to allow the Functional Workflow Task Tests stage to successfully run on Hera GNU (30 minute wall time isn't enough for the the community test to finish using GNU compiled executables). --- .cicd/Jenkinsfile | 11 +++++++++++ .cicd/scripts/wrapper_srw_ftest.sh | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/.cicd/Jenkinsfile b/.cicd/Jenkinsfile index 6231fd7e11..6e453f6f25 100644 --- a/.cicd/Jenkinsfile +++ b/.cicd/Jenkinsfile @@ -22,6 +22,17 @@ pipeline { } stages { + stage('Launch SonarQube') { + steps { + script { + build job: '/ufs-srweather-app/ufs-srw-sonarqube', parameters: [ + string(name: 'BRANCH_NAME', value: env.CHANGE_BRANCH ?: 'develop'), + string(name: 'FORK_NAME', value: env.CHANGE_FORK ?: '') + ], wait: false + } + } + } + // Uncomment the following block to re-enable PW clusters /* // Start the NOAA Parallel Works clusters, if necessary diff --git a/.cicd/scripts/wrapper_srw_ftest.sh b/.cicd/scripts/wrapper_srw_ftest.sh index 403233354a..2e35b43b89 100755 --- a/.cicd/scripts/wrapper_srw_ftest.sh +++ b/.cicd/scripts/wrapper_srw_ftest.sh @@ -33,6 +33,12 @@ if [[ "${SRW_PLATFORM}" == gaea-c5 ]]; then sed -i 's|qos=batch|qos=normal|g' ${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/${workflow_cmd}_srw_ftest.sh fi +if [[ "${SRW_PLATFORM}" == hera ]]; then + if [[ "${SRW_COMPILER}" == gnu ]]; then + sed -i 's|00:30:00|00:45:00|g' ${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/${workflow_cmd}_srw_ftest.sh + fi +fi + # Call job card and return job_id echo "Running: ${workflow_cmd} -A ${SRW_PROJECT} ${arg_1} ${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/${workflow_cmd}_srw_ftest.sh" job_id=$(${workflow_cmd} -A ${SRW_PROJECT} ${arg_1} ${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/${workflow_cmd}_srw_ftest.sh)