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.

Sign up for GitHub

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

GHA: SQL: don't override health checks #21

Merged
merged 1 commit into from
May 28, 2024
Merged

GHA: SQL: don't override health checks #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 2 additions & 7 deletions .github/workflows/sql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ jobs:
- {name: MariaDB 10.6, image: "mariadb:10.6"}
- {name: MariaDB 10.7, image: "mariadb:10.7"}
- {name: MariaDB 10.11, image: "mariadb:10.11"}
- {name: MariaDB 11.0, image: "mariadb:11.0", incompat: true}
- {name: MariaDB latest, image: "mariadb:latest", incompat: true}
- {name: MariaDB 11.0, image: "mariadb:11.0"}
- {name: MariaDB latest, image: "mariadb:latest"}

env:
ICINGAGOLIBRARY_TESTS_DB_TYPE: mysql
Expand All @@ -45,11 +45,6 @@ jobs:
MYSQL_DATABASE: icinga_unittest
MARIADB_ROOT_PASSWORD: password # mariadb >= 11
MARIADB_DATABASE: icinga_unittest # mariadb >= 11
options: >-
--health-cmd ${{ matrix.database.incompat == 'true' && '"healthcheck.sh --connect --innodb_initialized"' || '"mysqladmin ping"' }}
--health-interval 10s
--health-timeout 5s
--health-retries 10
ports:
- 3306:3306

Expand Down
Loading