create group 7 and split e2e json rpc tests (#1897)

0xPolygonHermez · Mar 21, 2023 · 29e8cf3 · 29e8cf3
1 parent fde26c2
commit 29e8cf3
Show file tree

Hide file tree

Showing 9 changed files with 472 additions and 433 deletions.
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
@@ -20,7 +20,7 @@ jobs:
       matrix:
         go-version: [ 1.18.x ]
         goarch: [ "amd64" ]
-        e2e-group: [ 1, 2, 3, 4, 5, 6 ]
+        e2e-group: [ 1, 2, 3, 4, 5, 6, 7 ]
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code
@@ -59,7 +59,7 @@ jobs:
       matrix:
         go-version: [ 1.18.x ]
         goarch: [ "amd64" ]
-        e2e-group: [ 1, 2, 3, 4, 5, 6 ]
+        e2e-group: [ 1, 2, 3, 4, 5, 6, 7 ]
     runs-on: ubuntu-latest
     steps:
     - name: Fork based /ok-to-test checkout

diff --git a/ci/e2e-group4/jsonrpc1_test.go b/ci/e2e-group4/jsonrpc1_test.go
@@ -0,0 +1 @@
+../../test/e2e/jsonrpc1_test.go
diff --git a/ci/e2e-group4/jsonrpc_test.go b/ci/e2e-group4/jsonrpc_test.go
diff --git a/ci/e2e-group7/jsonrpc2_test.go b/ci/e2e-group7/jsonrpc2_test.go
@@ -0,0 +1 @@
+../../test/e2e/jsonrpc2_test.go
diff --git a/ci/e2e-group7/shared.go b/ci/e2e-group7/shared.go
@@ -0,0 +1 @@
+../../test/e2e/shared.go
diff --git a/test/Makefile b/test/Makefile
@@ -156,6 +156,16 @@ test-e2e-group-6: stop ## Runs group 6 e2e tests checking race conditions
 	docker logs $(DOCKERCOMPOSEZKPROVER)
 	trap '$(STOP)' EXIT; MallocNanoZone=0 go test -count=1 -race -v -p 1 -timeout 600s ../ci/e2e-group6/...
 
+.PHONY: test-e2e-group-7
+test-e2e-group-7: stop ## Runs group 7 e2e tests checking race conditions
+	$(RUNSTATEDB)
+	$(RUNPOOLDB)
+	sleep 5
+	$(RUNZKPROVER)
+	docker ps -a
+	docker logs $(DOCKERCOMPOSEZKPROVER)
+	trap '$(STOP)' EXIT; MallocNanoZone=0 go test -count=1 -race -v -p 1 -timeout 600s ../ci/e2e-group7/...
+
 .PHONY: benchmark-sequencer-eth-transfers
 benchmark-sequencer-eth-transfers: stop
 	$(RUNL1NETWORK)