Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tests: runtime_shell: custom_calyptia prevent fail on macOS at cleanup #9827

Merged
merged 3 commits into from
Jan 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/skipped-unit-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ on:
- 'packaging/**'
- '.gitignore'
- 'appveyor.yml'
- '**.sh'
- 'examples/**'

jobs:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/unit-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions tests/runtime_shell/custom_calyptia.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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
Expand Down
Loading