From 293b904ac1e51ac08b4d6552d2c6d56ff0dd9d1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20N=C3=BA=C3=B1ez?= <david@nucypher.com>
Date: Mon, 6 May 2019 14:56:44 +0200
Subject: [PATCH] Include blockchain job in basics, and increase parallelism of
 agents

---
 .circleci/config.yml | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b809817eb..aba8ee924 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -42,13 +42,6 @@ workflows:
               only: /.*/
           requires:
             - pipenv_install_36
-      - blockchain:
-          context: "NuCypher Tests"
-          filters:
-            tags:
-              only: /.*/
-          requires:
-            - pipenv_install_36
       - character:
           context: "NuCypher Tests"
           filters:
@@ -63,7 +56,7 @@ workflows:
             tags:
               only: /.*/
           requires:
-            - blockchain
+            - basics
             # - contracts  (Removed dependency to speed up overall workflow execution)
       - actors:
           context: "NuCypher Tests"
@@ -83,7 +76,7 @@ workflows:
             tags:
               only: /.*/
           requires:
-            - blockchain
+            - basics
             # - contracts  (Removed dependency to speed up overall workflow execution)
       - cli:
           context: "NuCypher Tests"
@@ -298,19 +291,9 @@ jobs:
     steps:
       - pipenv_install
 
-  blockchain:
-    <<: *python_36_base
-    parallelism: 2
-    steps:
-      - prepare_environment
-      - run:
-          name: Blockchain Interface Tests
-          command: pipenv run pytest --cov=nucypher --cov-report xml:reports/coverage.xml $(circleci tests glob "tests/blockchain/eth/interfaces/*.py" | circleci tests split --split-by=timings)
-      - capture_test_results
-
   agents:
     <<: *python_36_base
-    parallelism: 4
+    parallelism: 6
     steps:
       - prepare_environment
       - run:
@@ -360,7 +343,7 @@ jobs:
       - run:
           name: Tests for Crypto functions, Node Configuration and Keystore
           command: |
-            pipenv run pytest --cov=nucypher --cov-report xml:reports/coverage.xml $(circleci tests glob "tests/config/**/test_*.py" "tests/crypto/**/test_*.py" "tests/keystore/**/test_*.py" | circleci tests split --split-by=timings)
+            pipenv run pytest --cov=nucypher --cov-report xml:reports/coverage.xml $(circleci tests glob "tests/config/**/test_*.py" "tests/crypto/**/test_*.py" "tests/keystore/**/test_*.py" "tests/blockchain/eth/interfaces/*.py" | circleci tests split --split-by=timings)
       - capture_test_results
 
   network: