fix: make sure to clean up any lingering processes (#1214)

n0-computer · Jul 12, 2023 · f782fef · f782fef
1 parent 8271594
commit f782fef
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -334,11 +334,18 @@ jobs:
     - name: Run tests
       run: |
         cd ../chuck/netsim
-        sudo kill -9 $(pgrep ovs)
-        sudo mn --clean
+        sudo kill -9 $(pgrep ovs) || true
+        sudo mn --clean || true
         sudo python3 main.py --integration sims/iroh/iroh.json
         sudo python3 main.py --integration sims/integration
 
+    - name: Cleanup
+      run: |
+        sudo kill -9 $(pgrep derper) || true
+        sudo kill -9 $(pgrep iroh) || true
+        sudo kill -9 $(pgrep ovs) || true
+        sudo mn --clean || true
+        
     - name: Setup Environment (PR)  
       if: ${{ github.event_name == 'pull_request' }}  
       shell: bash  

diff --git a/.github/workflows/netsim.yml b/.github/workflows/netsim.yml
@@ -111,8 +111,8 @@ jobs:
     - name: Run tests
       run: |
         cd ../chuck/netsim
-        sudo kill -9 $(pgrep ovs)
-        sudo mn --clean
+        sudo kill -9 $(pgrep ovs) || true
+        sudo mn --clean || true
         c='${{ steps.detect_comment_config.outputs.NETSIM_CONFIG }}'
         if [ -z "${c}" ];
         then
@@ -122,6 +122,13 @@ jobs:
           echo $c >> custom_sim.json
           sudo python3 main.py custom_sim.json
         fi
+      
+    - name: Cleanup
+      run: |
+        sudo kill -9 $(pgrep derper) || true
+        sudo kill -9 $(pgrep iroh) || true
+        sudo kill -9 $(pgrep ovs) || true
+        sudo mn --clean || true
 
     - name: Generate report
       id: generate_report