From 687430898116d98ff625fa9258ae89473dd26135 Mon Sep 17 00:00:00 2001
From: Jerry Zhao <jerryz123@berkeley.edu>
Date: Wed, 16 Sep 2020 15:27:43 -0700
Subject: [PATCH] Address review comments

---
 .circleci/config.yml      | 18 +++++++++---------
 .circleci/do-rtl-build.sh |  4 ----
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6ed04488..48ed4883 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -73,7 +73,7 @@ commands:
             tools-version:
                 type: string
                 default: "riscv-tools"
-            project-key:
+            group-key:
                 type: string
             timeout:
                 type: string
@@ -85,11 +85,11 @@ commands:
             - setup-tools:
                 tools-version: "<< parameters.tools-version >>"
             - run:
-                name: Building << parameters.project-key >> subproject using Verilator
-                command: .circleci/<< parameters.build-script >> << parameters.project-key >>
+                name: Building << parameters.group-key >> subproject using Verilator
+                command: .circleci/<< parameters.build-script >> << parameters.group-key >>
                 no_output_timeout: << parameters.timeout >>
             - save_cache:
-                key: << parameters.project-key >>-{{ .Branch }}-{{ .Revision }}
+                key: << parameters.group-key >>-{{ .Branch }}-{{ .Revision }}
                 paths:
                     - "/home/riscvuser/project"
 
@@ -192,28 +192,28 @@ jobs:
         executor: main-env
         steps:
             - prepare-rtl:
-                project-key: "group-cores"
+                group-key: "group-cores"
     prepare-chipyard-peripherals:
         executor: main-env
         steps:
             - prepare-rtl:
-                project-key: "group-peripherals"
+                group-key: "group-peripherals"
     prepare-chipyard-accels:
         executor: main-env
         steps:
             - prepare-rtl:
                 tools-version: "esp-tools"
-                project-key: "group-accels"
+                group-key: "group-accels"
     prepare-chipyard-tracegen:
         executor: main-env
         steps:
             - prepare-rtl:
-                project-key: "group-tracegen"
+                group-key: "group-tracegen"
     prepare-chipyard-other:
         executor: main-env
         steps:
             - prepare-rtl:
-                project-key: "group-other"
+                group-key: "group-other"
 
     chipyard-rocket-run-tests:
         executor: main-env
diff --git a/.circleci/do-rtl-build.sh b/.circleci/do-rtl-build.sh
index 9093b29e..784dbc04 100755
--- a/.circleci/do-rtl-build.sh
+++ b/.circleci/do-rtl-build.sh
@@ -52,10 +52,6 @@ fi
 
 # enter the verilator directory and build the specific config on remote server
 run "export RISCV=\"$TOOLS_DIR\"; \
-     export LD_LIBRARY_PATH=\"$LD_LIB_DIR\"; \
-     export PATH=\"$REMOTE_VERILATOR_DIR/bin:\$PATH\"; \
-     export VERILATOR_ROOT=\"$REMOTE_VERILATOR_DIR\"; \
-     export COURSIER_CACHE=\"$REMOTE_WORK_DIR/.coursier-cache\"; \
      make -C $REMOTE_SIM_DIR clean;"
 
 read -a keys <<< ${grouping[$1]}