got better jobname parcer working

NOAA-EMC · Dec 9, 2024 · ef0e066 · ef0e066
1 parent d18ad01
commit ef0e066
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/ci/scripts/ctests/CMakeLists.txt b/ci/scripts/ctests/CMakeLists.txt
@@ -39,9 +39,9 @@ function(GenerateJobWorkflows CASE)
     string(REGEX MATCHALL "${CASE}_[^;]+" PSLOT_LIST "${PSLOT_LIST}")
     message(STATUS "Filtered PSLOT list: ${PSLOT_LIST}\n\n")
 
-    message(STATUS "Executing: ${HOMEGFS}/ci/scripts/utils/get_job_names.py --xmlfile ${RUNTESTS}/EXPDIR/${PSLOT_LIST}/${PSLOT_LIST}.xml")
+    message(STATUS "Executing: ${HOMEGFS}/ci/scripts/utils/get_job_names.py --xml ${RUNTESTS}/EXPDIR/${PSLOT_LIST}/${PSLOT_LIST}.xml")
     execute_process(
-        COMMAND ${HOMEGFS}/ci/scripts/utils/get_job_names.py --xmlfile ${RUNTESTS}/EXPDIR/${PSLOT_LIST}/${PSLOT_LIST}.xml
+        COMMAND ${HOMEGFS}/ci/scripts/utils/get_job_names.py --xml ${RUNTESTS}/EXPDIR/${PSLOT_LIST}/${PSLOT_LIST}.xml
         WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
         OUTPUT_FILE ${CMAKE_BINARY_DIR}/${CASE}_jobs.txt
     )
@@ -51,9 +51,9 @@ function(GenerateJobWorkflows CASE)
 
     foreach(JOB IN LISTS JOB_NAMES)
         string(REGEX REPLACE "^${CASE}_" "" JOB_MODIFIED ${JOB})
-    	    message(STATUS "Executing: bash ${HOMEGFS}/workflow/generate_workflows.sh -V -H ${HOMEGFS} -y ${CASE}.yaml -t ${JOB_MODIFIED} ${RUNTESTS}")
+        message(STATUS "Executing: bash ${HOMEGFS}/workflow/generate_workflows.sh -V -H ${HOMEGFS} -y ${CASE}.yaml -t ${JOB_MODIFIED} ${RUNTESTS}")
         execute_process(
-            COMMAND bash ${HOMEGFS}/workflow/generate_workflows.sh -V -H ${HOMEGFS} -y ${CASE}.yaml -t ${JOB_MODIFIED} ${RUNTESTS}
+            COMMAND bash ${HOMEGFS}/workflow/generate_workflows.sh -V -H ${HOMEGFS} -y ${CASE}.yaml -t ${JOB_MODIFIED}_${GIT_HASH} ${RUNTESTS}
             WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
         )
     endforeach()

diff --git a/ci/scripts/utils/get_job_names.py b/ci/scripts/utils/get_job_names.py
@@ -54,7 +54,7 @@ def get_names_from_tags(xml_file):
 # Example usage
 if __name__ == "__main__":
     args = input_args()
-    xml_file = args.xmlfile
+    xml_file = args.xml
     job_names = get_names_from_tags(xml_file)
     for job_name in job_names:
         if "#" not in job_name: