wip: test

License: MIT Signed-off-by: Marcin Rataj <lidel@lidel.org>
ipfs · Jan 16, 2020 · a820e15 · a820e15
1 parent 28a9a65
commit a820e15
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -50,6 +50,9 @@ executors:
     environment:
       <<: *default_environment
       NO_SANDBOX: true
+      IPFS_REUSEPORT: false
+      LIBP2P_ALLOW_WEAK_RSA_KEYS: 1
+      E2E_IPFSD_TYPE: go
 
 jobs:
   gobuild:
@@ -195,7 +198,7 @@ jobs:
           working_directory: ~/ipfs/go-ipfs/interop
           environment:
             IPFS_REUSEPORT: false
-            LIBP2P_ALLOW_WEAK_RSA_KEYS: true
+            LIBP2P_ALLOW_WEAK_RSA_KEYS: 1
             IPFS_GO_EXEC: /tmp/circleci-workspace/bin/ipfs
       - store_test_results:
           path: /tmp/test-results
@@ -284,14 +287,15 @@ jobs:
             npm install
           working_directory: ~/ipfs/go-ipfs/ipfs-webui
       - run:
-          name: Running tests
+          name: Running upstream tests (finish early if they fail)
           command: |
-            npm test
+            npm test || circleci-agent step halt
+          working_directory: ~/ipfs/go-ipfs/ipfs-webui
+      - run:
+          name: Running tests with go-ipfs built from current commit
+          command: npm test
           working_directory: ~/ipfs/go-ipfs/ipfs-webui
           environment:
-            IPFS_REUSEPORT: false
-            LIBP2P_ALLOW_WEAK_RSA_KEYS: true
-            E2E_IPFSD_TYPE: go
             IPFS_GO_EXEC: /tmp/circleci-workspace/bin/ipfs
       - save_cache:
           key: v1-ipfs-webui-{{ checksum "~/ipfs/go-ipfs/ipfs-webui/package-lock.json" }}