From ce3dcba812a894ebc15630e479db5a611da503b2 Mon Sep 17 00:00:00 2001
From: Wojciech Sipak <wsipak@antmicro.com>
Date: Wed, 2 Oct 2024 13:52:45 +0200
Subject: [PATCH] kill openocd

---
 .github/scripts/openocd/board/caliptra-verilator-rst.cfg | 1 -
 .github/scripts/openocd/board/caliptra-verilator.cfg     | 1 -
 .github/workflows/build-openocd.yml                      | 2 +-
 .github/workflows/test-openocd.yml                       | 3 +++
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/scripts/openocd/board/caliptra-verilator-rst.cfg b/.github/scripts/openocd/board/caliptra-verilator-rst.cfg
index 31f8aef93ce..a8bfb01c331 100644
--- a/.github/scripts/openocd/board/caliptra-verilator-rst.cfg
+++ b/.github/scripts/openocd/board/caliptra-verilator-rst.cfg
@@ -3,4 +3,3 @@ source [find veer-el2-rst.cfg]
 
 # Increase timeouts in simulation
 riscv set_command_timeout_sec 300
-tcl_port 5001
diff --git a/.github/scripts/openocd/board/caliptra-verilator.cfg b/.github/scripts/openocd/board/caliptra-verilator.cfg
index 300fec0b35f..95a8d0144f1 100644
--- a/.github/scripts/openocd/board/caliptra-verilator.cfg
+++ b/.github/scripts/openocd/board/caliptra-verilator.cfg
@@ -3,4 +3,3 @@ source [find veer-el2.cfg]
 
 # Increase timeouts in simulation
 riscv set_command_timeout_sec 300
-tcl_port 5001
diff --git a/.github/workflows/build-openocd.yml b/.github/workflows/build-openocd.yml
index 8cc47f835c3..54f6b1390c9 100644
--- a/.github/workflows/build-openocd.yml
+++ b/.github/workflows/build-openocd.yml
@@ -12,7 +12,7 @@ jobs:
       # peripherals regardless of core state.
       OPENOCD_REPO: https://github.com/antmicro/openocd
       OPENOCD_VERSION: riscv-nohalt-change-module
-    
+
     steps:
       - name: Setup Cache Metadata
         id: cache_metadata
diff --git a/.github/workflows/test-openocd.yml b/.github/workflows/test-openocd.yml
index f395b7fba63..8b8825345bd 100644
--- a/.github/workflows/test-openocd.yml
+++ b/.github/workflows/test-openocd.yml
@@ -92,6 +92,7 @@ jobs:
           ${RV_ROOT}/.github/scripts/openocd_test.sh \
             -f ${RV_ROOT}/testbench/openocd_scripts/verilator-rst.cfg \
             -f ${RV_ROOT}/testbench/openocd_scripts/jtag_cg.tcl
+          pkill openocd
 
       - name: Test with GDB-test (register access)
         run: |
@@ -104,6 +105,7 @@ jobs:
           cd reg_test
           ${RV_ROOT}/.github/scripts/gdb_test.sh \
             /bin/bash -c 'cd ${RV_ROOT}/.github/scripts && ./dump_and_compare.sh'
+          pkill openocd
 
       - name: Test with GDB-test (memory access)
         run: |
@@ -116,6 +118,7 @@ jobs:
           cd mem_test
           ${RV_ROOT}/.github/scripts/gdb_test.sh \
             /bin/bash -c 'cd ${RV_ROOT}/.github/scripts && ./mem_access.sh'
+          pkill openocd
 
       - name: Prepare coverage data
         run: |