[dv] Increase stress tests run time limit to 3h

stress tests run longer than the other tests
Also changed stress_tests to import stress_all_test.hjson

Signed-off-by: Weicai Yang <weicai@google.com>
diff --git a/hw/dv/tools/dvsim/tests/stress_all_test.hjson b/hw/dv/tools/dvsim/tests/stress_all_test.hjson
index c1e21cb..88d3bfa 100644
--- a/hw/dv/tools/dvsim/tests/stress_all_test.hjson
+++ b/hw/dv/tools/dvsim/tests/stress_all_test.hjson
@@ -12,6 +12,7 @@
       uvm_test_seq: "{name}_stress_all_vseq"
       // 10ms
       run_opts: ["+test_timeout_ns=10000000000"]
+      run_timeout_mins: 180
     }
   ]
 }
diff --git a/hw/dv/tools/dvsim/tests/stress_tests.hjson b/hw/dv/tools/dvsim/tests/stress_tests.hjson
index 58b74a8..10e1db7 100644
--- a/hw/dv/tools/dvsim/tests/stress_tests.hjson
+++ b/hw/dv/tools/dvsim/tests/stress_tests.hjson
@@ -1,15 +1,11 @@
 // Copyright lowRISC contributors.
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
-{
-  tests: [
-    {
-      name: "{name}_stress_all"
-      uvm_test_seq: "{name}_stress_all_vseq"
-      // 10ms
-      run_opts: ["+test_timeout_ns=10000000000"]
-    }
 
+// this contains stress_all and stress_all_with_rand_reset
+{
+  import_cfgs: ["{proj_root}/hw/dv/tools/dvsim/tests/stress_all_test.hjson"]
+  tests: [
     {
       name: "{name}_stress_all_with_rand_reset"
       uvm_test_seq: "{name}_common_vseq"
@@ -17,6 +13,7 @@
                  // 10ms
                  "+test_timeout_ns=10000000000",
                  "+stress_seq={name}_stress_all_vseq"]
+      run_timeout_mins: 180
     }
   ]
 }