Try #2273:

spacemeshos · Jan 31, 2021 · 585a1a3 · 585a1a3
2 parents 3543283 + 0274c3b
commit 585a1a3
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 49 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -131,7 +131,7 @@ jobs:
         run: make dockerpush
 
   ## stage 3: finally run system tests in parallel if everything else passes
-  systemtest-latenodes:
+  systemtest-latenodes-1:
     # only run on push, not on pull_request
     if: github.event_name == 'push'
     needs: dockerpush
@@ -142,7 +142,7 @@ jobs:
         uses: actions/checkout@v2
       - name: late nodes system test
         run: make dockertest-late-nodes-elk
-  systemtest-blocks-add-node:
+  systemtest-latenodes-2:
     # only run on push, not on pull_request
     if: github.event_name == 'push'
     needs: dockerpush
@@ -151,9 +151,9 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v2
-      - name: blocks add node test
-        run: make dockertest-blocks-add-node-elk
-  systemtest-blocks-remove-node:
+      - name: late nodes system test
+        run: make dockertest-late-nodes-elk
+  systemtest-latenodes-3:
     # only run on push, not on pull_request
     if: github.event_name == 'push'
     needs: dockerpush
@@ -162,9 +162,9 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v2
-      - name: remove node test
-        run: make dockertest-blocks-remove-node-elk
-  systemtest-mining:
+      - name: late nodes system test
+        run: make dockertest-late-nodes-elk
+  systemtest-latenodes-4:
     # only run on push, not on pull_request
     if: github.event_name == 'push'
     needs: dockerpush
@@ -173,9 +173,9 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v2
-      - name: mining system test
-        run: make dockertest-mining-elk
-  systemtest-p2p:
+      - name: late nodes system test
+        run: make dockertest-late-nodes-elk
+  systemtest-latenodes-5:
     # only run on push, not on pull_request
     if: github.event_name == 'push'
     needs: dockerpush
@@ -184,9 +184,9 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v2
-      - name: p2p system test
-        run: make dockertest-p2p-elk
-  systemtest-hare:
+      - name: late nodes system test
+        run: make dockertest-late-nodes-elk
+  systemtest-latenodes-6:
     # only run on push, not on pull_request
     if: github.event_name == 'push'
     needs: dockerpush
@@ -195,9 +195,9 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v2
-      - name: hare system test
-        run: make dockertest-hare-elk
-  systemtest-sync:
+      - name: late nodes system test
+        run: make dockertest-late-nodes-elk
+  systemtest-latenodes-7:
     # only run on push, not on pull_request
     if: github.event_name == 'push'
     needs: dockerpush
@@ -206,35 +206,34 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v2
-      - name: hare system test
-        run: make dockertest-sync-elk
-
+      - name: late nodes system test
+        run: make dockertest-late-nodes-elk
 
   # this summary job is a shortcut that obviates the need to list every individual job in bors.toml
   # all tests that are required to pass before a bors merge must be listed here!
-  ci-stage2:
-    if: always() && github.event_name == 'push' && needs.ci-stage1.result == 'success'
-    needs:
-      - ci-stage1
-      - systemtest-latenodes
-      - systemtest-blocks-add-node
-      - systemtest-blocks-remove-node
-      - systemtest-mining
-      - systemtest-p2p
-      - systemtest-hare
-      - systemtest-sync
-    runs-on: ubuntu-latest
-    env:
-      status: ${{ needs.systemtest-latenodes.result == 'success' && needs.systemtest-blocks-add-node.result == 'success' && needs.systemtest-blocks-remove-node.result == 'success' && needs.systemtest-mining.result == 'success' && needs.systemtest-p2p.result == 'success' && needs.systemtest-hare.result == 'success' && needs.systemtest-sync.result == 'success' && 'success' || 'failure' }}
-    steps:
-      # print a single, clean status update to slack
-      - uses: act10ns/slack@v1
-        name: Slack notification
-        with:
-          status: ${{ env.status }}
-      - name: Mark the job as succeeded
-        if: env.status == 'success'
-        run: exit 0
-      - name: Mark the job as failed
-        if: env.status != 'success'
-        run: exit 1
+#  ci-stage2:
+#    if: always() && github.event_name == 'push' && needs.ci-stage1.result == 'success'
+#    needs:
+#      - ci-stage1
+#      - systemtest-latenodes
+#      - systemtest-blocks-add-node
+#      - systemtest-blocks-remove-node
+#      - systemtest-mining
+#      - systemtest-p2p
+#      - systemtest-hare
+#      - systemtest-sync
+#    runs-on: ubuntu-latest
+#    env:
+#      status: ${{ needs.systemtest-latenodes.result == 'success' && needs.systemtest-blocks-add-node.result == 'success' && needs.systemtest-blocks-remove-node.result == 'success' && needs.systemtest-mining.result == 'success' && needs.systemtest-p2p.result == 'success' && needs.systemtest-hare.result == 'success' && needs.systemtest-sync.result == 'success' && 'success' || 'failure' }}
+#    steps:
+#      # print a single, clean status update to slack
+#      - uses: act10ns/slack@v1
+#        name: Slack notification
+#        with:
+#          status: ${{ env.status }}
+#      - name: Mark the job as succeeded
+#        if: env.status == 'success'
+#        run: exit 0
+#      - name: Mark the job as failed
+#        if: env.status != 'success'
+#        run: exit 1
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -139,7 +139,7 @@ def fin():
             print("\nDeleting test namespace: {0}".format(testconfig['namespace']))
             v1.delete_namespace(name=testconfig['namespace'], body=client.V1DeleteOptions())
 
-    request.addfinalizer(fin)
+    # request.addfinalizer(fin)
     return _setup_namespace()
 
 
@@ -266,8 +266,8 @@ def add_node_pool():
     _, time_elapsed = deployer.add_node_pool()
     print(f"total time waiting for clients node pool creation: {time_elapsed}")
     yield time_elapsed
-    _, time_elapsed = deployer.remove_node_pool()
-    print(f"total time waiting for clients node pool deletion: {time_elapsed}")
+    # _, time_elapsed = deployer.remove_node_pool()
+    # print(f"total time waiting for clients node pool deletion: {time_elapsed}")
 
 
 @pytest.fixture(scope='module')