Repository navigation
ci: Deploy Jaeger and the executor in the smoke test - #1475
Closed
marcleblanc2 wants to merge 1 commit into
Closed
marcleblanc2 wants to merge 1 commit into
marcleblanc2 wants to merge 1 commit into
Conversation
The smoke test started only docker-compose.yaml, then started a second, separate executor with `docker compose run`. Jaeger never ran. Start all three Compose files with one `up`, so the container count, health check wait, and restart check cover every service. The executor exits without a password and a queue name, so a test override file sets them, and executor-smoke-test.sh reads the password from the container. Amp-Thread-ID: https://ampcode.com/threads/T-01a1c731-7931-7091-9b5e-664cc2379c79 Co-authored-by: Amp <amp@ampcode.com>
1 task done
Contributor
Author
|
Closing in favor of #1489, which deploys Jaeger and the executor in the smoke test. The branch stays. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Stacked on #1472. The smoke test deployed
docker-compose.yamlonly. Jaeger never ran, and the executor was a second container started later withdocker compose run, so the container count, health check wait, and restart check never covered either one.smoke-test.shnow passes all three Compose files to everydocker-composecommand (pull,up,config --services), so the same checks cover all 27 long-running services.This PR's build fails until #1465 merges, and it should. The first run found that the Jaeger overlay on
maincrash-loops:#1369 changed the
commandto Jaeger v2's--configin March, but the image stayed atjaeger-all-in-one:6.1.2889, which is Jaeger v1.60.0. The release PR #1465 moves it to8.1.4690. With #1465's images Jaeger starts, and the test passes.Changes
test/smoke-test.sh: onecompose_fileslist, used by everydocker-composecommand. New check that Jaeger answers onlocalhost:16686/-/debug/jaeger/.test/docker-compose.override.yaml(new): setsEXECUTOR_FRONTEND_PASSWORDandEXECUTOR_QUEUE_NAME. The executor exits without them, andexecutor.docker-compose.yamlships them empty.test/executor-smoke-test.sh: no longer starts its own executor. It reads the password from the runningexecutorcontainer, sets it asexecutors.accessToken, and waits for that container to register..buildkite/validate-docker-compose.sh: also validates the combination the smoke test deploys.Things to know
executors.accessTokenis set, so its first requests are rejected. It keeps running and registers once the test sets the token. "Running with no restarts" therefore does not prove the executor works; the registration check does./scratchon the test VM.executor.docker-compose.yamlpinsexecutor:6.0.0. Update main: build v8.1.4690 #1465 moves it to8.1.4690too.Checklist
Test plan
expected 27 running containers, found 26,jaeger: Restarting (1), andjaeger.logwas uploaded as an artifact.upregistered after 10s. The smoke test job's log spans 324s; ci: Close the gaps in what CI checks #1472's took about 290s. One run each.:docker:step passed in both builds, including the new four-filedocker compose config.shellcheckis clean on every script.