Fix EXTRA_RELVALS_TESTS

cms-sw · Feb 20, 2025 · 51cfeb6 · 51cfeb6
1 parent e51ab87
commit 51cfeb6
Show file tree

Hide file tree

Showing 9 changed files with 749 additions and 15 deletions.
diff --git a/pr_testing/test_multiple_prs.sh b/pr_testing/test_multiple_prs.sh
@@ -103,7 +103,7 @@ PR_TESTING_DIR=${CMS_BOT_DIR}/pr_testing
 COMMON=${CMS_BOT_DIR}/common
 CONFIG_MAP=$CMS_BOT_DIR/config.map
 [ "${USE_IB_TAG}" != "true" ] && export USE_IB_TAG=false
-[ "${EXTRA_RELVALS_TESTS}" = "" ] && EXTRA_RELVALS_TESTS="GPU THREADING HIGH_STATS NANO"
+[ "${EXTRA_RELVALS_TESTS}" = "" ] && (EXTRA_RELVALS_TESTS=$ALL_GPU_TYPES[@]; EXTRA_RELVALS_TESTS="${EXTRA_RELVALS_TESTS} THREADING HIGH_STATS NANO")
 EXTRA_RELVALS_TESTS=$(echo ${EXTRA_RELVALS_TESTS} | tr ' ' '\n' | grep -v THREADING | tr '\n' ' ')
 # ---
 # doc: Input variable

diff --git a/process_pr.py b/process_pr.py
@@ -143,8 +143,8 @@ def format(s, **kwds):
 REGEX_IGNORE_FILE_COUNT = r"\+file-count"
 TEST_WAIT_GAP = 720
 ALL_CHECK_FUNCTIONS = None
-GPU_FLAVORS = open("all_gpu_types.txt", "r").read().splitlines()
-EXTRA_RELVALS_TESTS = ["threading", "gpu", "high-stats", "nano"]
+GPU_FLAVORS = open(join(dirname(__file__), "all_gpu_types.txt"), "r").read().splitlines()
+EXTRA_RELVALS_TESTS = ["threading", "high-stats", "nano"] + GPU_FLAVORS
 EXTRA_RELVALS_TESTS_OPTS = "_" + "|_".join(EXTRA_RELVALS_TESTS)
 EXTRA_TESTS = "{0}|{1}||hlt_p2_integration|hlt_p2_timing|profiling|none|multi-microarchs".format(
     "|".join(EXTRA_RELVALS_TESTS), "|".join(GPU_FLAVORS)

diff --git a/tests/PRActionData/TestProcessPr.test_abort.json b/tests/PRActionData/TestProcessPr.test_abort.json
@@ -110,7 +110,7 @@
                 "SKIP_TESTS": "header,static",
                 "PULL_REQUESTS": "iarspider-cmssw/cmssw#17 cms-sw/cms-bot#2134",
                 "RELEASE_FORMAT": "CMSSW_14_1_CPP20_X",
-                "EXTRA_RELVALS_TESTS": "THREADING GPU HIGH_STATS NANO",
+                "EXTRA_RELVALS_TESTS": "THREADING HIGH_STATS NANO CUDA ROCM",
                 "CONTEXT_PREFIX": "cms/17"
             }
         }
@@ -147,4 +147,4 @@
             "context": "bot/17/ack"
         }
     }
-]
+]
diff --git a/tests/PRActionData/TestProcessPr.test_draft_pr_ready.json b/tests/PRActionData/TestProcessPr.test_draft_pr_ready.json
@@ -70,7 +70,7 @@
             "filename": "trigger-tests-iarspider-cmssw-cmssw-21.properties",
             "data": {
                 "PULL_REQUESTS": "iarspider-cmssw/cmssw#21",
-                "EXTRA_RELVALS_TESTS": "THREADING GPU HIGH_STATS NANO",
+                "EXTRA_RELVALS_TESTS": "THREADING HIGH_STATS NANO CUDA ROCM",
                 "CONTEXT_PREFIX": "cms/21"
             }
         }
@@ -101,4 +101,4 @@
             "context": "bot/21/ack"
         }
     }
-]
+]
diff --git a/tests/PRActionData/TestProcessPr.test_draft_pr_start_test.json b/tests/PRActionData/TestProcessPr.test_draft_pr_start_test.json
@@ -70,7 +70,7 @@
             "filename": "trigger-tests-iarspider-cmssw-cmssw-21.properties",
             "data": {
                 "PULL_REQUESTS": "iarspider-cmssw/cmssw#21",
-                "EXTRA_RELVALS_TESTS": "THREADING GPU HIGH_STATS NANO",
+                "EXTRA_RELVALS_TESTS": "THREADING HIGH_STATS NANO CUDA ROCM",
                 "CONTEXT_PREFIX": "cms/21"
             }
         }
@@ -97,4 +97,4 @@
             "context": "bot/21/ack"
         }
     }
-]
+]
diff --git a/tests/PRActionData/TestProcessPr.test_run_test_params.json b/tests/PRActionData/TestProcessPr.test_run_test_params.json
@@ -123,7 +123,7 @@
                 "SKIP_TESTS": "header,static",
                 "PULL_REQUESTS": "iarspider-cmssw/cmssw#17 cms-sw/cms-bot#2134",
                 "RELEASE_FORMAT": "CMSSW_14_1_CPP20_X",
-                "EXTRA_RELVALS_TESTS": "THREADING GPU HIGH_STATS NANO",
+                "EXTRA_RELVALS_TESTS": "THREADING HIGH_STATS NANO CUDA ROCM",
                 "CONTEXT_PREFIX": "cms/17"
             }
         }
@@ -150,4 +150,4 @@
             "context": "bot/17/ack"
         }
     }
-]
+]
diff --git a/tests/PRActionData/TestProcessPr.test_start_tests.json b/tests/PRActionData/TestProcessPr.test_start_tests.json
@@ -88,7 +88,7 @@
             "filename": "trigger-tests-iarspider-cmssw-cmssw-17.properties",
             "data": {
                 "PULL_REQUESTS": "iarspider-cmssw/cmssw#17",
-                "EXTRA_RELVALS_TESTS": "THREADING GPU HIGH_STATS NANO",
+                "EXTRA_RELVALS_TESTS": "THREADING HIGH_STATS NANO CUDA ROCM",
                 "CONTEXT_PREFIX": "cms/17"
             }
         }
@@ -129,4 +129,4 @@
             "context": "bot/17/ack"
         }
     }
-]
+]
diff --git a/tests/PRActionData/TestProcessPr.test_tests_passed.json b/tests/PRActionData/TestProcessPr.test_tests_passed.json
@@ -87,7 +87,7 @@
             "filename": "trigger-tests-iarspider-cmssw-cmssw-17.properties",
             "data": {
                 "PULL_REQUESTS": "iarspider-cmssw/cmssw#17",
-                "EXTRA_RELVALS_TESTS": "THREADING GPU HIGH_STATS NANO",
+                "EXTRA_RELVALS_TESTS": "THREADING HIGH_STATS NANO CUDA ROCM",
                 "CONTEXT_PREFIX": "cms/17"
             }
         }
@@ -114,4 +114,4 @@
             "context": "bot/17/ack"
         }
     }
-]
+]