From 5bec8f0924e458e497b2b2a5fb15ef6a21a63013 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Thu, 9 Jul 2026 13:56:36 +0000 Subject: [PATCH] Fix CLI scrape-interval test flake from parallel PMM server startup Serialize the two PMM server containers in docker-compose-scrape-intervals and add explicit readyz healthchecks so FB CLI pmm-client docker runs do not fail when both servers compete for resources on CI runners. Co-authored-by: davi.travaglia --- .../docker-compose-scrape-intervals.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/cli/test-setup/docker-compose-scrape-intervals.yml b/cli/test-setup/docker-compose-scrape-intervals.yml index 892f266f0..d5d519494 100644 --- a/cli/test-setup/docker-compose-scrape-intervals.yml +++ b/cli/test-setup/docker-compose-scrape-intervals.yml @@ -14,6 +14,12 @@ services: - "1443:8443" environment: - PMM_DEBUG=1 + healthcheck: + test: [ "CMD", "curl", "-f", "http://127.0.0.1:8080/v1/server/readyz" ] + interval: 5s + timeout: 3s + retries: 40 + start_period: 60s networks: - scrape-interval @@ -51,6 +57,15 @@ services: - PMM_DEBUG=1 - PMM_PROMSCRAPE_MAX_SCRAPE_SIZE=128MiB - VMAGENT_remoteWrite_maxDiskUsagePerURL=52428800 + depends_on: + pmm-server-scrape-interval: + condition: service_healthy + healthcheck: + test: [ "CMD", "curl", "-f", "http://127.0.0.1:8080/v1/server/readyz" ] + interval: 5s + timeout: 3s + retries: 40 + start_period: 60s networks: - scrape-interval