Repository navigation
ci: Check every Compose file and shell script, and test Jaeger and the executor - #1489
Open
marcleblanc2 wants to merge 3 commits into
Open
marcleblanc2 wants to merge 3 commits into
marcleblanc2 wants to merge 3 commits into
Conversation
This was referenced Nov 11, 2026
marcleblanc2
force-pushed
the
marc/ci-check-compose-shell-jaeger-executor
branch
2 times, most recently
from
November 11, 2026 23:45
8b6381c to
a122ad8
Compare
1 task done
marcleblanc2
force-pushed
the
marc/ci-check-compose-shell-jaeger-executor
branch
from
November 12, 2026 04:05
a122ad8 to
2304672
Compare
1 task done
marcleblanc2
force-pushed
the
marc/ci-check-compose-shell-jaeger-executor
branch
from
November 12, 2026 22:27
0614d78 to
db4754c
Compare
marcleblanc2
force-pushed
the
marc/ci-check-compose-shell-jaeger-executor
branch
from
November 12, 2026 22:56
db4754c to
c972cd2
Compare
marcleblanc2
force-pushed
the
marc/ci-check-compose-shell-jaeger-executor
branch
from
November 13, 2026 04:58
c972cd2 to
dd24b60
Compare
marcleblanc2
changed the base branch from
main
to
marc/smoke-test-wait-for-health
November 13, 2026 04:58
1 task done
marcleblanc2
marked this pull request as ready for review
November 13, 2026 05:36
marcleblanc2
enabled stacked auto-merge (squash)
November 13, 2026 05:40
marcleblanc2
added a commit
that referenced
this pull request
Nov 13, 2026
…ot read Widens the if_changed exclude list from Markdown to the files the smoke test never reads: GitHub and editor settings, release manifests, Prettier inputs, the Compose files it does not start, and the Caddyfiles the base file leaves commented out. New files still run the smoke test. The executor and Jaeger Compose files and test/executor-smoke-test.sh stay off the list, because #1489 adds them to the smoke test. Co-authored-by: Amp <amp@ampcode.com> Amp-Thread-ID: https://ampcode.com/threads/T-01a1d3ba-ceb2-7220-8dc4-46d20882d955
1 task done
stacked auto-merge was automatically disabled
November 13, 2026 07:29
Auto-merge was disabled for another pull request in the stack
marcleblanc2
force-pushed
the
marc/ci-check-compose-shell-jaeger-executor
branch
from
November 13, 2026 07:40
dd24b60 to
4706f1b
Compare
…e executor Validates every Compose file in the combinations the docs give, runs shellcheck on every shell script, and deploys Jaeger and the executor in the smoke test. The VM now runs test/executor-smoke-test.sh after test/smoke-test.sh. Declares the sourcegraph network in executor.docker-compose.yaml, which the standalone command in its README needs, and switches dev/run.sh to docker compose. Fixes the one shellcheck warning, in vagrant-run.sh. Amp-Thread-ID: https://ampcode.com/threads/T-01a1c7a5-6b65-723b-980c-b85e1e9008b5 Co-authored-by: Amp <amp@ampcode.com>
Sets EXECUTOR_QUEUE_NAMES to batches, batches-hooks, and codeintel, instead of EXECUTOR_QUEUE_NAME to batches. EXECUTOR_QUEUE_NAME takes one queue, and the executor refuses to start when both variables are set, so the override leaves the base file's empty EXECUTOR_QUEUE_NAME alone. Co-authored-by: Amp <amp@ampcode.com> Amp-Thread-ID: https://ampcode.com/threads/T-01a1c7a5-6b65-723b-980c-b85e1e9008b5
The executor smoke test passed as soon as any executor registered. It now also fails unless an executor serves exactly the three queues which test/docker-compose.override.yaml sets: batches, batches-hooks, and codeintel. Amp-Thread-ID: https://ampcode.com/threads/T-01a1c7a5-6b65-723b-980c-b85e1e9008b5 Co-authored-by: Amp <amp@ampcode.com>
marcleblanc2
force-pushed
the
marc/ci-check-compose-shell-jaeger-executor
branch
from
November 13, 2026 07:51
4706f1b to
8c7c2e6
Compare
1 task done
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.
Closes three gaps in CI: it validated only the base Compose file, did not lint the shell scripts, and never deployed Jaeger or the executor.
shellcheckon every*.shfile and the Buildkite hook.shellcheck 0.11.0goes in.tool-versions, which is now sorted by name.smoke-test.shstarts the base file withjaeger/andexecutors/, and checks that the Jaeger UI answers. Thenexecutor-smoke-test.sh, which CI never ran, checks that the executor registers and serves exactly the queuesbatches,batches-hooks, andcodeintel.AGENTS.md.What the new checks found
executor.docker-compose.yamlfailed when run alone, asexecutors/README.mddescribes:service "executor" refers to undefined network sourcegraph. It now declares the network. This is the only change customers can see.dev/run.shand its README calleddocker-compose(v1). They now usedocker compose..buildkite/vagrant-run.shassigned and exportedDOCKER_PASSWORDin one statement, which hides a failedgcloudcall (SC2155).Risk: low. CI and dev tooling, plus the network declaration above.
Things to know
!overrideand!resettags in three examples but ignores them. For those three, CI checks that the file parses, not that the merged result is right.jqbefore the executor test, because the VM image lacks it.Checklist
Test plan
Executor serves the queues batches,batches-hooks,codeintelandEXECUTOR SMOKE TEST PASSEDvalidate-docker-compose.shpasses on Compose 2.18.1 and 5.7.1curlanddockercommands: three queues pass in any order; two, four, or none fail and print the names found; no executor fails after 120 secondsCloses FE-589