Skip to content

Commit 27734ee

Browse files
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 <pat@chronosphere.io> * workflows: ensure we run runtime_shell unit tests on change Signed-off-by: Patrick Stephens <pat@chronosphere.io> * workflows: disable test Signed-off-by: Patrick Stephens <pat@chronosphere.io> --------- Signed-off-by: Patrick Stephens <pat@chronosphere.io>
1 parent 417d129 commit 27734ee

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.github/workflows/skipped-unit-tests.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ on:
1010
- 'packaging/**'
1111
- '.gitignore'
1212
- 'appveyor.yml'
13-
- '**.sh'
1413
- 'examples/**'
1514

1615
jobs:

.github/workflows/unit-tests.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,13 @@ on:
1515
- 'packaging/**'
1616
- '.gitignore'
1717
- 'appveyor.yml'
18-
- '**.sh'
1918
- 'examples/**'
2019
branches:
2120
- master
21+
- 3.2
22+
- 3.1
23+
- 3.0
24+
- 2.2
2225
- 2.1
2326
- 2.0
2427
- 1.9
@@ -112,7 +115,6 @@ jobs:
112115
CC: gcc
113116
CXX: g++
114117
FLB_OPT: ${{ matrix.flb_option }}
115-
CALYPTIA_FLEET_TOKEN: ${{ secrets.CALYPTIA_FLEET_TOKEN }}
116118

117119
run-aarch64-unit-tests:
118120
# Ensure for OSS Fluent Bit repo we enable usage of Actuated runners for ARM builds, for forks it should keep existing ubuntu-latest usage.

tests/runtime_shell/custom_calyptia.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ test_custom_calyptia_fleet_yaml() {
2727
fi
2828

2929
# Clean up
30-
kill -15 $FLB_PID
30+
kill -15 $FLB_PID || true
3131
}
3232

3333
test_custom_calyptia_fleet_toml() {
@@ -57,7 +57,7 @@ test_custom_calyptia_fleet_toml() {
5757
fi
5858

5959
# Clean up
60-
kill -15 $FLB_PID
60+
kill -15 $FLB_PID || true
6161
}
6262

6363
# The following command launch the unit test

0 commit comments

Comments
 (0)