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

Jump to bottom

test(itest): improve container startup health detection #1534

Merged
merged 9 commits into from
Jun 10, 2023
Merged

test(itest): improve container startup health detection #1534

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8b0ba0c
test(itest): add health checks to containers
andrewazores Jun 9, 2023
3d7bc1c
fix(itest): query container health via podman for startup check
andrewazores Jun 9, 2023
71632f9
remove flags unsupported by CI runner
andrewazores Jun 9, 2023
a64070e
query 'podman ps' output for CI compat
andrewazores Jun 9, 2023
bccd146
check grafana health endpoint for startup
andrewazores Jun 9, 2023
f4a5a03
case insensitive grep for 'health' response
andrewazores Jun 9, 2023
c3b3866
ensure startup check does not match UNhealthy state
andrewazores Jun 9, 2023
352050c
fixup! ensure startup check does not match UNhealthy state
andrewazores Jun 10, 2023
2343b4b
also include status field for purpose of tracking how long container …
andrewazores Jun 10, 2023
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
20 changes: 15 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,11 @@
<cryostat.itest.webHost>localhost</cryostat.itest.webHost>
<cryostat.itest.podName>cryostat-itests</cryostat.itest.podName>
<cryostat.itest.containerName>cryostat-itest</cryostat.itest.containerName>
<cryostat.itest.grafana.containerName>grafana-itest</cryostat.itest.grafana.containerName>
<cryostat.itest.grafana.port>3000</cryostat.itest.grafana.port>
<cryostat.itest.grafana.imageStream>quay.io/cryostat/cryostat-grafana-dashboard</cryostat.itest.grafana.imageStream>
<cryostat.itest.grafana.version>latest</cryostat.itest.grafana.version>
<cryostat.itest.jfr-datasource.containerName>jfr-datasource-itest</cryostat.itest.jfr-datasource.containerName>
<cryostat.itest.jfr-datasource.port>8080</cryostat.itest.jfr-datasource.port>
<cryostat.itest.jfr-datasource.imageStream>quay.io/cryostat/jfr-datasource</cryostat.itest.jfr-datasource.imageStream>
<cryostat.itest.jfr-datasource.version>latest</cryostat.itest.jfr-datasource.version>
Expand Down Expand Up @@ -498,7 +500,9 @@
<argument>run</argument>
<argument>--pull=${cryostat.itest.pullImages}</argument>
<argument>--pod=${cryostat.itest.podName}</argument>
<argument>--name=jfr-datasource-itest</argument>
<argument>--name=${cryostat.itest.jfr-datasource.containerName}</argument>
<argument>--health-cmd</argument>
<argument>curl --fail http://localhost:${cryostat.itest.jfr-datasource.port}</argument>
<argument>--detach</argument>
<argument>--rm</argument>
<argument>${cryostat.itest.jfr-datasource.imageStream}:${cryostat.itest.jfr-datasource.version}</argument>
Expand All @@ -518,7 +522,9 @@
<argument>run</argument>
<argument>--pull=${cryostat.itest.pullImages}</argument>
<argument>--pod=${cryostat.itest.podName}</argument>
<argument>--name=grafana-itest</argument>
<argument>--name=${cryostat.itest.grafana.containerName}</argument>
<argument>--health-cmd</argument>
<argument>wget -q --spider http://localhost:${cryostat.itest.grafana.port}/api/health</argument>
<argument>--env</argument>
<argument>GF_INSTALL_PLUGINS=grafana-simple-json-datasource</argument>
<argument>--env</argument>
Expand All @@ -542,6 +548,10 @@
<argument>run</argument>
<argument>--pod=${cryostat.itest.podName}</argument>
<argument>--name=${cryostat.itest.containerName}</argument>
<argument>--health-cmd</argument>
<argument>curl --fail http://localhost:8181/health/liveness</argument>
<argument>--requires</argument>
tthvo marked this conversation as resolved.
Show resolved Hide resolved
<argument>${cryostat.itest.grafana.containerName},${cryostat.itest.jfr-datasource.containerName}</argument>
<argument>--mount</argument>
<argument>type=tmpfs,target=/opt/cryostat.d/conf.d</argument>
<argument>--mount</argument>
Expand Down Expand Up @@ -617,7 +627,7 @@
<argument>5m</argument>
<argument>sh</argument>
<argument>-c</argument>
<argument>until sleep 5; curl -sSk -o /dev/null http://${cryostat.itest.webHost}:${cryostat.itest.webPort}/health/liveness; do sleep 2; done</argument>
<argument>until podman ps --filter health=healthy --format '{{.Names}} {{.Status}}' | grep ${cryostat.itest.containerName}; do sleep 5; done</argument>
</arguments>
<skip>${skipITs}</skip>
</configuration>
Expand All @@ -634,7 +644,7 @@
<argument>5m</argument>
<argument>sh</argument>
<argument>-c</argument>
<argument>until curl -sSk -o /dev/null http://${cryostat.itest.webHost}:${cryostat.itest.jfr-datasource.port}; do sleep 2; done</argument>
<argument>until podman ps --filter health=healthy --format '{{.Names}} {{.Status}}' | grep ${cryostat.itest.jfr-datasource.containerName}; do sleep 5; done</argument>
</arguments>
<skip>${skipITs}</skip>
</configuration>
Expand All @@ -651,7 +661,7 @@
<argument>5m</argument>
<argument>sh</argument>
<argument>-c</argument>
<argument>until curl -sSk -o /dev/null http://${cryostat.itest.webHost}:${cryostat.itest.grafana.port}; do sleep 2; done</argument>
<argument>until podman ps --filter health=healthy --format '{{.Names}} {{.Status}}' | grep ${cryostat.itest.grafana.containerName}; do sleep 5; done</argument>
</arguments>
<skip>${skipITs}</skip>
</configuration>
Expand Down