tests: runtime_shell: custom_calyptia prevent fail on macOS at cleanup (

#9827) * tests: runtime_shell: custom_calyptia prevent fail on macOS at cleanup Signed-off-by: Patrick Stephens <[email protected]> * workflows: ensure we run runtime_shell unit tests on change Signed-off-by: Patrick Stephens <[email protected]> * workflows: disable test Signed-off-by: Patrick Stephens <[email protected]> --------- Signed-off-by: Patrick Stephens <[email protected]>
fluent · Jan 13, 2025 · 27734ee · 27734ee
1 parent 417d129
commit 27734ee
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/skipped-unit-tests.yaml b/.github/workflows/skipped-unit-tests.yaml
@@ -10,7 +10,6 @@ on:
       - 'packaging/**'
       - '.gitignore'
       - 'appveyor.yml'
-      - '**.sh'
       - 'examples/**'
 
 jobs:

diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml
@@ -15,10 +15,13 @@ on:
       - 'packaging/**'
       - '.gitignore'
       - 'appveyor.yml'
-      - '**.sh'
       - 'examples/**'
     branches:
       - master
+      - 3.2
+      - 3.1
+      - 3.0
+      - 2.2
       - 2.1
       - 2.0
       - 1.9
@@ -112,7 +115,6 @@ jobs:
           CC: gcc
           CXX: g++
           FLB_OPT: ${{ matrix.flb_option }}
-          CALYPTIA_FLEET_TOKEN: ${{ secrets.CALYPTIA_FLEET_TOKEN }}
 
   run-aarch64-unit-tests:
     # Ensure for OSS Fluent Bit repo we enable usage of Actuated runners for ARM builds, for forks it should keep existing ubuntu-latest usage.

diff --git a/tests/runtime_shell/custom_calyptia.sh b/tests/runtime_shell/custom_calyptia.sh
@@ -27,7 +27,7 @@ test_custom_calyptia_fleet_yaml() {
     fi
 
     # Clean up
-    kill -15 $FLB_PID
+    kill -15 $FLB_PID || true
 }
 
 test_custom_calyptia_fleet_toml() {
@@ -57,7 +57,7 @@ test_custom_calyptia_fleet_toml() {
     fi
 
     # Clean up
-    kill -15 $FLB_PID
+    kill -15 $FLB_PID || true
 }
 
 # The following command launch the unit test