[mq] working branch - merge 4da0394 on top of main at 42911ae

{"baseBranch":"main","baseCommit":"42911aeeccd6b47959f61c86fed4907b96b1ae7f","createdAt":"2024-12-11T14:49:16.352229Z","headSha":"4da0394865a0af94c701f4cea401c8c945ecb060","id":"24e7148a-30a2-4f65-8cfe-2d90fe6dc0eb","priority":"200","pullRequestNumber":"31989","queuedAt":"2024-12-11T14:49:16.351516Z","status":"STATUS_QUEUED","waitingOnQueuesIds":["3816c921-b9e4-497c-83bb-904ddebdf889_414"]}
DataDog · Dec 11, 2024 · bdb13c5 · bdb13c5
2 parents c949840 + 4da0394
commit bdb13c5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/tasks/collector.py b/tasks/collector.py
@@ -478,6 +478,7 @@ def update_files(self):
             "./comp/otelcol/collector/impl/collector.go",
             "./tasks/collector.py",
             "./.gitlab/integration_test/otel.yml",
+            "./test/otel/testdata/ocb_build_script.sh",
         ]
         for root, _, files in os.walk("./tasks/unit_tests/testdata/collector"):
             for file in files:

diff --git a/test/otel/testdata/ocb_build_script.sh b/test/otel/testdata/ocb_build_script.sh
@@ -19,7 +19,7 @@ cp ./test/otel/testdata/collector-config.yaml /tmp/otel-ci/
 cp ./tools/ci/retry.sh /tmp/otel-ci/
 chmod +x /tmp/otel-ci/retry.sh
 
-OCB_VERSION="0.114.0"
+OCB_VERSION="0.115.0"
 CGO_ENABLED=0 go install -trimpath -ldflags="-s -w" go.opentelemetry.io/collector/cmd/builder@v${OCB_VERSION}
 mv "$(go env GOPATH)/bin/builder" /tmp/otel-ci/ocb