GH-15839: move explain related tests to one stage (#15844)

* Move explain related tests * Increase the explain stages timeoutValue * Skip NOPASS in the explain stage The run.py when provided with a test list runs everything on the test list so we need to exclude NOPASS from the testlist. When running the other tests the list .lookup is used as exclude list and the NOPASS tests are excluded while searching for the tests. * Fix lookup for cases when there are no tests
h2oai · Nov 1, 2023 · b3dfc37 · b3dfc37
1 parent cd38506
commit b3dfc37
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 7 deletions.
diff --git a/h2o-py/tests/testdir_misc/pyunit_SHAP.py → ...tests/testdir_misc/explain/pyunit_SHAP.py b/h2o-py/tests/testdir_misc/pyunit_SHAP.py → ...tests/testdir_misc/explain/pyunit_SHAP.py
diff --git a/.../tests/testdir_misc/pyunit_SHAP_NOPASS.py → ...estdir_misc/explain/pyunit_SHAP_NOPASS.py b/.../tests/testdir_misc/pyunit_SHAP_NOPASS.py → ...estdir_misc/explain/pyunit_SHAP_NOPASS.py
diff --git a/h2o-py/tests/testdir_misc/pyunit_explain.py → ...ts/testdir_misc/explain/pyunit_explain.py b/h2o-py/tests/testdir_misc/pyunit_explain.py → ...ts/testdir_misc/explain/pyunit_explain.py
diff --git a/...s/testdir_misc/pyunit_make_leaderboard.py → ...r_misc/explain/pyunit_make_leaderboard.py b/...s/testdir_misc/pyunit_make_leaderboard.py → ...r_misc/explain/pyunit_make_leaderboard.py
diff --git a/h2o-r/tests/testdir_misc/runit_SHAP.R → ...r/tests/testdir_misc/explain/runit_SHAP.R b/h2o-r/tests/testdir_misc/runit_SHAP.R → ...r/tests/testdir_misc/explain/runit_SHAP.R
@@ -1,5 +1,5 @@
 setwd(normalizePath(dirname(R.utils::commandArgs(asValues = TRUE)$"f")))
-source("../../scripts/h2o-r-test-setup.R")
+source("../../../scripts/h2o-r-test-setup.R")
 
 
 ALGOS <- c("deeplearning", "drf", "gbm", "glm", "stackedensemble", "xgboost")

diff --git a/h2o-r/tests/testdir_misc/runit_explain.R → ...ests/testdir_misc/explain/runit_explain.R b/h2o-r/tests/testdir_misc/runit_explain.R → ...ests/testdir_misc/explain/runit_explain.R
@@ -1,5 +1,5 @@
 setwd(normalizePath(dirname(R.utils::commandArgs(asValues = TRUE)$"f")))
-source("../../scripts/h2o-r-test-setup.R")
+source("../../../scripts/h2o-r-test-setup.R")
 
 expect_ggplot <- function(gg) {
   p <- force(gg)

diff --git a/...sts/testdir_misc/runit_make_leaderboard.R → ...dir_misc/explain/runit_make_leaderboard.R b/...sts/testdir_misc/runit_make_leaderboard.R → ...dir_misc/explain/runit_make_leaderboard.R
@@ -1,5 +1,5 @@
 setwd(normalizePath(dirname(R.utils::commandArgs(asValues = TRUE)$"f")))
-source("../../scripts/h2o-r-test-setup.R")
+source("../../../scripts/h2o-r-test-setup.R")
 
 test_make_leaderboard_without_leaderboard_frame <- function() {
   train <- h2o.uploadFile(locate("smalldata/titanic/titanic_expanded.csv"))

diff --git a/scripts/jenkins/Makefile.jenkins b/scripts/jenkins/Makefile.jenkins
@@ -61,8 +61,8 @@ lookup-fault-tolerance-tests: init-lookup
 	find h2o-py/tests -name '*fault_tolerance*.py' -exec basename {} \; >>h2o-py/tests/.lookup.txt
 
 lookup-explain-tests: init-lookup
-	find h2o-r/tests -name '*explain*.R' -exec basename {} \; >>h2o-r/tests/.lookup.txt
-	find h2o-py/tests -name '*explain*.py' -exec basename {} \; >>h2o-py/tests/.lookup.txt
+	find h2o-r/tests -path '*testdir_misc/explain*' -name '*.R' -not -name '*NOPASS*' -exec basename {} \; >>h2o-r/tests/.lookup.txt
+	find h2o-py/tests -path '*testdir_misc/explain*' -name '*.py'  -not -name '*NOPASS*' -exec basename {} \; >>h2o-py/tests/.lookup.txt
 
 lookup-mojo-to-assembly-tests: init-lookup
 	find h2o-r/tests -name '*h2oassembly_download_mojo*.R' -exec basename {} \; >>h2o-r/tests/.lookup.txt

diff --git a/scripts/jenkins/groovy/defineTestStages.groovy b/scripts/jenkins/groovy/defineTestStages.groovy
@@ -530,7 +530,7 @@ def call(final pipelineContext) {
     ],
     [
       stageName: 'Py3.7 Explain', target: 'test-pyunit-explain', pythonVersion: '3.7',
-      timeoutValue: 90, component: pipelineContext.getBuildConfig().COMPONENT_PY
+      timeoutValue: 180, component: pipelineContext.getBuildConfig().COMPONENT_PY
     ],
     [
       stageName: 'Py3.11 Single Node', target: 'test-pyunit-single-node', pythonVersion: '3.11',
@@ -559,7 +559,7 @@ def call(final pipelineContext) {
     ],
     [
       stageName: 'R4.0 Explain', target: 'test-r-explain', rVersion: '4.0.2',
-      timeoutValue: 125, component: pipelineContext.getBuildConfig().COMPONENT_R
+      timeoutValue: 180, component: pipelineContext.getBuildConfig().COMPONENT_R
     ],
   ]