ci: Test jaeger-v2 as all-in-one in CI #4890
Merged
Conversation
This file contains 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
yurishkuro
added
v2
changelog:ci
Codecov ReportAll modified and coverable lines are covered by tests ✅ see 2 files with indirect coverage changes 📢 Thoughts on this report? Let us know!. |
yurishkuro
changed the title
|
Marked this WIP because it fails to start jaeger-v2 due to what looks like the random ordering of extensions startup sequence, whereas jaegerquery extension can only run after jaegerstorage |
yurishkuro
commented
Nov 2, 2023
| @@ -51,6 +51,10 @@ jobs: | |||
| if: github.ref_name != 'main' | |||
| run: bash scripts/build-all-in-one-image.sh pr-only | |||
|
|
|||
| - name: Build and test jaeger-v2 as all-in-one | |||
| if: github.ref_name != 'main' | |||
| run: BINARY=jaeger-v2 bash scripts/build-all-in-one-image.sh pr-only | |||
There was a problem hiding this comment.
this only added 39s to the total run, I think it's worth keeping in this workflow for now
yurishkuro
changed the title
albertteoh
previously approved these changes
Nov 2, 2023
scripts/build-all-in-one-image.sh
Outdated
| @@ -35,35 +43,40 @@ run_integration_test() { | |||
| docker kill "$CID" | |||
| } | |||
|
|
|||
| if [ "$mode" = "pr-only" ]; then | |||
| if [ -n "$pull_request" ]; then | |||
There was a problem hiding this comment.
I suggest something like the following to help with readability:
is_pull_request=true
if [ "$is_pull_request" = true ]; then
if [ "$is_pull_request" = false ]; then| @@ -35,6 +38,11 @@ func newServer(config *Config, otel component.TelemetrySettings) *server { | |||
| } | |||
| } | |||
|
|
|||
| // Dependencies implements extension.Dependent to ensure this always starts after jaegerstorage extension. | |||
Signed-off-by: Yuri Shkuro <github@ysh.us>
Signed-off-by: Yuri Shkuro <github@ysh.us>
yurishkuro
commented
Nov 3, 2023
| @@ -61,7 +61,7 @@ require ( | |||
| go.opentelemetry.io/collector/exporter/loggingexporter v0.88.0 | |||
| go.opentelemetry.io/collector/exporter/otlpexporter v0.88.0 | |||
| go.opentelemetry.io/collector/exporter/otlphttpexporter v0.88.0 | |||
| go.opentelemetry.io/collector/extension v0.88.0 | |||
| go.opentelemetry.io/collector/extension v0.88.1-0.20231102040825-2e44da36e2c6 | |||
There was a problem hiding this comment.
pinned to main branch for now, it will get updates once OTEL does a new release, which should happen before our next release in Dec
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.
Which problem is this PR solving?
Description of the changes
cmd/jaeger-v2/Dockerfilescripts/build-all-in-one-image.shto allow runningjaeger-v2instead ofall-in-onejaeger-v2from .github/workflows/ci-all-in-one-build.ymlHow was this change tested?