Skip to content

Commit 570c047

Browse files
[develop] Update CI/CD pipeline to work properly on Gaea C6 (#1384)
* .cicd/scripts/wrapper_srw_ftest.sh - Updated job_id to include | awk -F';' '{print $1}' to allow the Functional WorkflowTaskTests stage to run on Gaea C6 following the SLURM update. Add a separate run for Derecho, since the fix doesn't work with PBS
1 parent ac1f31b commit 570c047

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

.cicd/scripts/wrapper_srw_ftest.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,11 @@ fi
4747

4848
# Call job card and return job_id
4949
echo "Running: ${workflow_cmd} -A ${SRW_PROJECT} ${arg_1} ${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/${workflow_cmd}_srw_ftest.sh"
50-
job_id=$(${workflow_cmd} -A ${SRW_PROJECT} ${arg_1} ${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/${workflow_cmd}_srw_ftest.sh)
50+
if [[ "${SRW_PLATFORM}" == derecho ]]; then
51+
job_id=$(${workflow_cmd} -A ${SRW_PROJECT} ${arg_1} ${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/${workflow_cmd}_srw_ftest.sh)
52+
else
53+
job_id=$(${workflow_cmd} -A ${SRW_PROJECT} ${arg_1} ${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/${workflow_cmd}_srw_ftest.sh) | awk -F';' '{print $1}'
54+
fi
5155

5256
echo "Waiting ten seconds for node to initialize"
5357
sleep 10

0 commit comments

Comments
 (0)