circleci: revive/rework enabling Constantinople runs on CI.

This used to be a commit by @cburgdorf, but it got eaten in the rebase (as it had most of the conflicts).
ethereum · Dec 13, 2018 · a7b3497 · a7b3497
1 parent 6124909
commit a7b3497
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -108,6 +108,12 @@ jobs:
       - image: circleci/python:3.5
         environment:
           TOXENV: py35-native-blockchain-byzantium
+  py35-native-blockchain-constantinople:
+    <<: *common
+    docker:
+      - image: circleci/python:3.5
+        environment:
+          TOXENV: py35-native-blockchain-constantinople
   py35-native-blockchain-frontier:
     <<: *common
     docker:
@@ -175,6 +181,12 @@ jobs:
       - image: circleci/python:3.6
         environment:
           TOXENV: py36-native-blockchain-byzantium
+  py36-native-blockchain-constantinople:
+    <<: *common
+    docker:
+      - image: circleci/python:3.6
+        environment:
+          TOXENV: py36-native-blockchain-constantinople
   py36-native-blockchain-frontier:
     <<: *common
     docker:
@@ -211,6 +223,12 @@ jobs:
       - image: circleci/python:3.6
         environment:
           TOXENV: py36-rpc-state-byzantium
+  py36-rpc-state-constantinople:
+    <<: *common
+    docker:
+      - image: circleci/python:3.6
+        environment:
+          TOXENV: py36-rpc-state-constantinople
   py36-rpc-state-frontier:
     <<: *common
     docker:
@@ -340,12 +358,14 @@ workflows:
       - py37-beacon
 
       - py36-native-blockchain-byzantium
+      - py36-native-blockchain-constantinople
       - py36-native-blockchain-frontier
       - py36-native-blockchain-homestead
       - py36-native-blockchain-eip150
       - py36-native-blockchain-eip158
       - py36-native-blockchain-transition
       - py36-rpc-state-byzantium
+      - py36-rpc-state-constantinople
       - py36-rpc-state-frontier
       - py36-rpc-state-homestead
       - py36-rpc-state-eip150
@@ -364,6 +384,7 @@ workflows:
       - py36-beacon
 
       - py35-native-blockchain-byzantium
+      - py35-native-blockchain-constantinople
       - py35-native-blockchain-frontier
       - py35-native-blockchain-homestead
       - py35-native-blockchain-eip150

diff --git a/tox.ini b/tox.ini
@@ -3,7 +3,7 @@ envlist=
     py{35,36}-{core,database,transactions,vm}
     py{36}-{benchmark,p2p,trinity,lightchain_integration,beacon}
     py{36}-rpc-blockchain
-    py{36}-rpc-state-{frontier,homestead,eip150,eip158,byzantium,quadratic}
+    py{36}-rpc-state-{frontier,homestead,eip150,eip158,byzantium,constantinople,quadratic}
     py{35,36}-native-blockchain-{frontier,homestead,eip150,eip158,byzantium,constantinople,metropolis,transition}
     py37-{core,trinity,trinity-integration,beacon}
     py{35,36}-lint
@@ -32,6 +32,8 @@ commands=
     beacon: pytest {posargs:tests/beacon/}
     # The following test seems to consume a lot of memory. Restricting to 3 processes reduces crashes
     rpc-state-byzantium: pytest -n3 {posargs:tests/trinity/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and Byzantium'}
+    # Uncomment the next line + modify test_rpc_fixtures.py when Constantinople is included in the mainnet config
+    rpc-state-constantinople: pytest -n3 {posargs:tests/trinity/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and Constantinople'}
     rpc-state-quadratic: pytest {posargs:tests/trinity/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and stQuadraticComplexityTest'}
     transactions: pytest {posargs:tests/json-fixtures/test_transactions.py}
     vm: pytest {posargs:tests/json-fixtures/test_virtual_machine.py}