op: update circle config for op-tests

ethereum-optimism · Sep 8, 2022 · 36002ae · 36002ae
1 parent b44fc61
commit 36002ae
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,7 +6,7 @@ jobs:
   # This job builds the hive executable and stores it in the workspace.
   build:
     docker:
-      - image: cimg/go:1.17
+      - image: cimg/go:1.18
     steps:
       # Build it.
       - checkout
@@ -19,19 +19,17 @@ jobs:
           root: .
           paths: ["hive"]
 
-  # This job runs the smoke test simulations. This requires a virtual
-  # machine instead of the container-based build environment because
-  # hive needs to be able to talk to the docker containers it creates.
-  smoke-tests:
+  # This job runs the optimism test simulations. This requires a virtual
+  # machine instead of the container-based build environment because hive needs
+  # to be able to talk to the docker containers it creates.
+  op-tests:
     machine:
       image: ubuntu-2004:202201-02
     steps:
       - checkout
       - attach_workspace: {at: "/tmp/build"}
       - run:
-          command: "/tmp/build/hive --sim=smoke/genesis --client=go-ethereum"
-      - run:
-          command: "/tmp/build/hive --sim=smoke/network --client=go-ethereum"
+          command: "/tmp/build/hive --sim=optimism --client=op-l1,op-l2,op-proposer,op-batcher,op-node"
 
   # This job also runs the smoke test simulations, but against a remote dockerd.
   smoke-tests-remote-docker:
@@ -49,7 +47,7 @@ jobs:
   # This job runs the go unit tests.
   go-test:
     docker:
-      - image: cimg/go:1.17
+      - image: cimg/go:1.18
     steps:
       # Get the source.
       - checkout
@@ -73,7 +71,7 @@ workflows:
     jobs:
       - go-test
       - build
-      - smoke-tests:
+      - op-tests:
           requires: ["build"]
       - smoke-tests-remote-docker:
           requires: ["build"]
diff --git a/.circleci/upgrade-hivesim.sh b/.circleci/upgrade-hivesim.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-version=latest
+version=optimism
 if [ -n "$1" ]; then
     version="$1"
 fi
@@ -12,7 +12,7 @@ for d in $sims; do
     (
         set -e
         cd $d
-        go get -d "github.com/ethereum/hive@$version"
-        go mod tidy -compat=1.17
+        go get -d "github.com/ethereum-optimism/hive@$version"
+        go mod tidy
     )
 done