Kserrania/otel agent #33962
Kserrania/otel agent #33962
Conversation
github-actions
bot
added
team/agent-delivery
medium review
| docker_build_ot_agent7: | ||
| extends: [.docker_build_job_definition_amd64, .docker_build_artifact] | ||
| rules: | ||
| - !reference [.except_mergequeue] | ||
| - when: on_success | ||
| needs: | ||
| - job: datadog-ot-agent-7-x64 | ||
| - job: datadog-agent-7-x64 | ||
| - job: otel-agent-x64 | ||
| variables: | ||
| IMAGE: registry.ddbuild.io/ci/datadog-agent/agent | ||
| BUILD_CONTEXT: Dockerfiles/agent | ||
| TAG_SUFFIX: -7-ot-beta |
There was a problem hiding this comment.
Should we get rid of the beta suffix right now if it's supposed to be GA for 7.64?
| variables: | ||
| IMAGE: registry.ddbuild.io/ci/datadog-agent/agent | ||
| BUILD_CONTEXT: Dockerfiles/agent | ||
| TAG_SUFFIX: -7-ot-beta | ||
| BUILD_ARG: --target test --build-arg DD_AGENT_ARTIFACT=datadog-ot-agent-7*-amd64.tar.xz | ||
| BUILD_ARG: --target test --build-arg DD_AGENT_ARTIFACT=datadog-*-7*-amd64.tar.xz |
There was a problem hiding this comment.
Would having this be a tiny bit safer?
| BUILD_ARG: --target test --build-arg DD_AGENT_ARTIFACT=datadog-*-7*-amd64.tar.xz | |
| BUILD_ARG: --target test --build-arg DD_AGENT_ARTIFACT=datadog-{ot-,}agent-7*-amd64.tar.xz |
I'm worried that we might use the same pattern in the future and accidentally end up with extra artifacts we don't really want there
There was a problem hiding this comment.
(Same for the other BUILD_ARG)
| Omnibus::Config.git_cache_dir ENV["OMNIBUS_GIT_CACHE_DIR"] | ||
| end | ||
|
|
||
| if windows_target? |
There was a problem hiding this comment.
Should we break osx_target too?
| if linux_target? | ||
| extra_package_file "#{output_config_dir}/etc/datadog-agent/" | ||
| end | ||
|
|
||
| exclude '\.git*' | ||
| exclude 'bundler\/git' | ||
|
|
||
| if linux_target? or windows_target? | ||
| # the stripper will drop the symbols in a `.debug` folder in the installdir | ||
| # we want to make sure that directory is not in the main build, while present | ||
| # in the debug package. | ||
| strip_build true | ||
| debug_path ".debug" # the strip symbols will be in here | ||
| end |
There was a problem hiding this comment.
nit - my guess is you kept the if statements for simplicity because we're testing here, but they could be dropped since we do not support windows yet
| cache: | ||
| - !reference [.cache_omnibus_ruby_deps, cache] | ||
|
|
||
| otel-agent-x64: |
There was a problem hiding this comment.
I don't know how consistent we want to be, but I would call these jobs datadog-otel-agent-*
What does this PR do?
Motivation
Describe how you validated your changes
Possible Drawbacks / Trade-offs
Additional Notes