Revert "try latest changes to circle ci settings"

This reverts commit 6024feb27a.

.circleci/config.yml

@@ -12,7 +12,7 @@ parameters:
 executors:
     main-env:
         docker:
-            - image: ucbbar/chipyard-ci-image:84cfc73
+            - image: ucbbar/chipyard-image:1.0.1
         environment:
             JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
 
@@ -112,7 +112,7 @@ commands:
                 default: "run-tests.sh"
             timeout:
                 type: string
-                default: "20m"
+                default: "10m"
         steps:
             - setup-tools:
                 tools-version: "<< parameters.tools-version >>"
@@ -231,7 +231,7 @@ jobs:
             - run-tests:
                 group-key: "group-cores"
                 project-key: "chipyard-hetero"
-                timeout: "20m"
+                timeout: "15m"
     chipyard-boom-run-tests:
         executor: main-env
         steps: