From 4e36ef98e02e7a7adbd850e48c135ea0f69b55ce Mon Sep 17 00:00:00 2001 From: Gustavo Caso Date: Tue, 11 Feb 2025 16:44:34 +0100 Subject: [PATCH 1/4] Update Go version to 1.23.6 --- .circleci/config.yml | 2 +- .gitlab-ci.yml | 88 +++++++++---------- .go-version | 2 +- .wwhrd.yml | 2 +- devenv/scripts/Install-DevEnv.ps1 | 2 +- docs/dev/agent_dev_env.md | 2 +- go.mod | 2 +- go.work | 2 +- .../bump-go-to-1.23.6-eec53756d8368c71.yaml | 4 + tasks/go.py | 2 +- test/fakeintake/Dockerfile | 2 +- test/new-e2e/go.mod | 4 +- tools/gdb/Dockerfile | 2 +- 13 files changed, 60 insertions(+), 56 deletions(-) create mode 100644 releasenotes/notes/bump-go-to-1.23.6-eec53756d8368c71.yaml diff --git a/.circleci/config.yml b/.circleci/config.yml index 3997bb0e5e2fc0..4f794ddb3a79bf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,7 +15,7 @@ experimental: templates: job_template: &job_template docker: - - image: gcr.io/datadoghq/agent-circleci-runner:v54965839-ff6db30b + - image: gcr.io/datadoghq/agent-circleci-runner_test_only:v55533027-075ad767 environment: USE_SYSTEM_LIBS: "1" working_directory: /go/src/github.com/DataDog/datadog-agent diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c3351a518ac097..229c8ccb6cf922 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -169,51 +169,51 @@ variables: # Build images versions # To use images from datadog-agent-buildimages dev branches, set the corresponding # SUFFIX variable to _test_only - DATADOG_AGENT_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_BUILDIMAGES: v54965839-ff6db30b - DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_WINBUILDIMAGES: v54965839-ff6db30b - DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_ARMBUILDIMAGES: v54965839-ff6db30b - DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v54965839-ff6db30b - DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v54965839-ff6db30b + DATADOG_AGENT_BUILDIMAGES_SUFFIX: "_test_only" + DATADOG_AGENT_BUILDIMAGES: v55533027-075ad767 + DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "_test_only" + DATADOG_AGENT_WINBUILDIMAGES: v55533027-075ad767 + DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "_test_only" + DATADOG_AGENT_ARMBUILDIMAGES: v55533027-075ad767 + DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "_test_only" + DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v55533027-075ad767 + DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "_test_only" + DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v55533027-075ad767 # New images to enable different version per image - not used yet - CI_IMAGE_BTF_GEN: v54965839-ff6db30b - CI_IMAGE_BTF_GEN_SUFFIX: "" - CI_IMAGE_DEB_X64: v54965839-ff6db30b - CI_IMAGE_DEB_X64_SUFFIX: "" - CI_IMAGE_DEB_ARM64: v54965839-ff6db30b - CI_IMAGE_DEB_ARM64_SUFFIX: "" - CI_IMAGE_DEB_ARMHF: v54965839-ff6db30b - CI_IMAGE_DEB_ARMHF_SUFFIX: "" - CI_IMAGE_DD_AGENT_TESTING: v54965839-ff6db30b - CI_IMAGE_DD_AGENT_TESTING_SUFFIX: "" - CI_IMAGE_DOCKER_X64: v54965839-ff6db30b - CI_IMAGE_DOCKER_X64_SUFFIX: "" - CI_IMAGE_DOCKER_ARM64: v54965839-ff6db30b - CI_IMAGE_DOCKER_ARM64_SUFFIX: "" - CI_IMAGE_GITLAB_AGENT_DEPLOY: v54965839-ff6db30b - CI_IMAGE_GITLAB_AGENT_DEPLOY_SUFFIX: "" - CI_IMAGE_LINUX_GLIBC_2_17_X64: v54965839-ff6db30b - CI_IMAGE_LINUX_GLIBC_2_17_X64_SUFFIX: "" - CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v54965839-ff6db30b - CI_IMAGE_LINUX_GLIBC_2_23_ARM64_SUFFIX: "" - CI_IMAGE_SYSTEM_PROBE_X64: v54965839-ff6db30b - CI_IMAGE_SYSTEM_PROBE_X64_SUFFIX: "" - CI_IMAGE_SYSTEM_PROBE_ARM64: v54965839-ff6db30b - CI_IMAGE_SYSTEM_PROBE_ARM64_SUFFIX: "" - CI_IMAGE_RPM_X64: v54965839-ff6db30b - CI_IMAGE_RPM_X64_SUFFIX: "" - CI_IMAGE_RPM_ARM64: v54965839-ff6db30b - CI_IMAGE_RPM_ARM64_SUFFIX: "" - CI_IMAGE_RPM_ARMHF: v54965839-ff6db30b - CI_IMAGE_RPM_ARMHF_SUFFIX: "" - CI_IMAGE_WIN_1809_X64: v54965839-ff6db30b - CI_IMAGE_WIN_1809_X64_SUFFIX: "" - CI_IMAGE_WIN_LTSC2022_X64: v54965839-ff6db30b - CI_IMAGE_WIN_LTSC2022_X64_SUFFIX: "" + CI_IMAGE_BTF_GEN: v55533027-075ad767 + CI_IMAGE_BTF_GEN_SUFFIX: "_test_only" + CI_IMAGE_DEB_X64: v55533027-075ad767 + CI_IMAGE_DEB_X64_SUFFIX: "_test_only" + CI_IMAGE_DEB_ARM64: v55533027-075ad767 + CI_IMAGE_DEB_ARM64_SUFFIX: "_test_only" + CI_IMAGE_DEB_ARMHF: v55533027-075ad767 + CI_IMAGE_DEB_ARMHF_SUFFIX: "_test_only" + CI_IMAGE_DD_AGENT_TESTING: v55533027-075ad767 + CI_IMAGE_DD_AGENT_TESTING_SUFFIX: "_test_only" + CI_IMAGE_DOCKER_X64: v55533027-075ad767 + CI_IMAGE_DOCKER_X64_SUFFIX: "_test_only" + CI_IMAGE_DOCKER_ARM64: v55533027-075ad767 + CI_IMAGE_DOCKER_ARM64_SUFFIX: "_test_only" + CI_IMAGE_GITLAB_AGENT_DEPLOY: v55533027-075ad767 + CI_IMAGE_GITLAB_AGENT_DEPLOY_SUFFIX: "_test_only" + CI_IMAGE_LINUX_GLIBC_2_17_X64: v55533027-075ad767 + CI_IMAGE_LINUX_GLIBC_2_17_X64_SUFFIX: "_test_only" + CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v55533027-075ad767 + CI_IMAGE_LINUX_GLIBC_2_23_ARM64_SUFFIX: "_test_only" + CI_IMAGE_SYSTEM_PROBE_X64: v55533027-075ad767 + CI_IMAGE_SYSTEM_PROBE_X64_SUFFIX: "_test_only" + CI_IMAGE_SYSTEM_PROBE_ARM64: v55533027-075ad767 + CI_IMAGE_SYSTEM_PROBE_ARM64_SUFFIX: "_test_only" + CI_IMAGE_RPM_X64: v55533027-075ad767 + CI_IMAGE_RPM_X64_SUFFIX: "_test_only" + CI_IMAGE_RPM_ARM64: v55533027-075ad767 + CI_IMAGE_RPM_ARM64_SUFFIX: "_test_only" + CI_IMAGE_RPM_ARMHF: v55533027-075ad767 + CI_IMAGE_RPM_ARMHF_SUFFIX: "_test_only" + CI_IMAGE_WIN_1809_X64: v55533027-075ad767 + CI_IMAGE_WIN_1809_X64_SUFFIX: "_test_only" + CI_IMAGE_WIN_LTSC2022_X64: v55533027-075ad767 + CI_IMAGE_WIN_LTSC2022_X64_SUFFIX: "_test_only" DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded DEB_GPG_KEY_ID: c0962c7d diff --git a/.go-version b/.go-version index ca8ec414e78720..d8c40e539ce6be 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.23.5 +1.23.6 diff --git a/.wwhrd.yml b/.wwhrd.yml index 9ca0e52d9758ee..1654376c2835cb 100644 --- a/.wwhrd.yml +++ b/.wwhrd.yml @@ -45,4 +45,4 @@ exceptions: additional: # list here paths to additional licenses - golang/go: "raw.githubusercontent.com/golang/go/go1.23.5/LICENSE" + golang/go: "raw.githubusercontent.com/golang/go/go1.23.6/LICENSE" diff --git a/devenv/scripts/Install-DevEnv.ps1 b/devenv/scripts/Install-DevEnv.ps1 index 5d7b7e6a4c43be..4f4a6c238e360a 100644 --- a/devenv/scripts/Install-DevEnv.ps1 +++ b/devenv/scripts/Install-DevEnv.ps1 @@ -45,7 +45,7 @@ Write-Host -ForegroundColor Yellow -BackgroundColor DarkGreen '- Installing Gola $ErrorActionPreference = 'Stop' $ProgressPreference = 'SilentlyContinue' -$go_version = "1.23.5" +$go_version = "1.23.6" Write-Host -ForegroundColor Green "Installing go $go_version" $gozip = "https://dl.google.com/go/go$go_version.windows-amd64.zip" diff --git a/docs/dev/agent_dev_env.md b/docs/dev/agent_dev_env.md index e53dfeb49dc334..91a3addfc62409 100644 --- a/docs/dev/agent_dev_env.md +++ b/docs/dev/agent_dev_env.md @@ -138,7 +138,7 @@ This procedure ensures you not only get the correct version of `invoke`, but als ### Golang -You must [install Golang](https://golang.org/doc/install) version `1.23.5` or +You must [install Golang](https://golang.org/doc/install) version `1.23.6` or later. Make sure that `$GOPATH/bin` is in your `$PATH` otherwise `invoke` cannot use any additional tool it might need. diff --git a/go.mod b/go.mod index 215de63dbc19b8..c3ba72efa8adf6 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/DataDog/datadog-agent -go 1.23.3 +go 1.23.0 // v0.8.0 was tagged long ago, and appared on pkg.go.dev. We do not want any tagged version // to appear there. The trick to accomplish this is to make a new version (in this case v0.9.0) diff --git a/go.work b/go.work index c3ca1642084cdc..ee4edaab465389 100644 --- a/go.work +++ b/go.work @@ -1,6 +1,6 @@ go 1.23.3 -toolchain go1.23.5 +toolchain go1.23.6 use ( . diff --git a/releasenotes/notes/bump-go-to-1.23.6-eec53756d8368c71.yaml b/releasenotes/notes/bump-go-to-1.23.6-eec53756d8368c71.yaml new file mode 100644 index 00000000000000..69e7f8b82af5bf --- /dev/null +++ b/releasenotes/notes/bump-go-to-1.23.6-eec53756d8368c71.yaml @@ -0,0 +1,4 @@ +--- +enhancements: +- | + Agents are now built with Go ``1.23.6``. diff --git a/tasks/go.py b/tasks/go.py index cd925143fba88c..f54fa762061f28 100644 --- a/tasks/go.py +++ b/tasks/go.py @@ -343,7 +343,7 @@ def tidy(ctx): @task def check_go_version(ctx): go_version_output = ctx.run('go version') - # result is like "go version go1.23.5 linux/amd64" + # result is like "go version go1.23.6 linux/amd64" running_go_version = go_version_output.stdout.split(' ')[2] with open(".go-version") as f: diff --git a/test/fakeintake/Dockerfile b/test/fakeintake/Dockerfile index be078b9f78f6bb..8b6172951d8026 100644 --- a/test/fakeintake/Dockerfile +++ b/test/fakeintake/Dockerfile @@ -2,7 +2,7 @@ # syntax=docker/dockerfile:1 ## Build -FROM golang:1.23.5-alpine3.20 AS build +FROM golang:1.23.6-alpine3.20 AS build # need gcc to build with CGO_ENABLED=1 # need musl-dev to get stdlib.h diff --git a/test/new-e2e/go.mod b/test/new-e2e/go.mod index 99c4f74742ff6f..e9ce48994f5f77 100644 --- a/test/new-e2e/go.mod +++ b/test/new-e2e/go.mod @@ -1,8 +1,8 @@ module github.com/DataDog/datadog-agent/test/new-e2e -go 1.23.3 +go 1.23.1 -toolchain go1.23.5 +toolchain go1.23.6 // Do not upgrade Pulumi plugins to versions different from `test-infra-definitions`. // The plugin versions NEED to be aligned. diff --git a/tools/gdb/Dockerfile b/tools/gdb/Dockerfile index 2f932a8c66df50..e1c00c092471c1 100644 --- a/tools/gdb/Dockerfile +++ b/tools/gdb/Dockerfile @@ -6,7 +6,7 @@ RUN rm -vf /etc/ssl/openssl.cnf RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y gdb build-essential strace less vim # Install go -RUN curl -fSL -o golang.tgz https://go.dev/dl/go1.23.5.linux-amd64.tar.gz +RUN curl -fSL -o golang.tgz https://go.dev/dl/go1.23.6.linux-amd64.tar.gz RUN tar xzvf golang.tgz RUN ln -s /go /goroot From 2c962fc627ff0154c84f23abeb30caa1be0d1c4e Mon Sep 17 00:00:00 2001 From: Gustavo Caso Date: Wed, 12 Feb 2025 15:34:59 +0100 Subject: [PATCH 2/4] update test image to use msgo patch 2 --- .circleci/config.yml | 2 +- .gitlab-ci.yml | 44 ++++++++++++++++++++++---------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4f794ddb3a79bf..4a81eff702b6c7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,7 +15,7 @@ experimental: templates: job_template: &job_template docker: - - image: gcr.io/datadoghq/agent-circleci-runner_test_only:v55533027-075ad767 + - image: gcr.io/datadoghq/agent-circleci-runner_test_only:v55653430-4a930850 environment: USE_SYSTEM_LIBS: "1" working_directory: /go/src/github.com/DataDog/datadog-agent diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 229c8ccb6cf922..707d8a6a7d76e2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -170,49 +170,49 @@ variables: # To use images from datadog-agent-buildimages dev branches, set the corresponding # SUFFIX variable to _test_only DATADOG_AGENT_BUILDIMAGES_SUFFIX: "_test_only" - DATADOG_AGENT_BUILDIMAGES: v55533027-075ad767 + DATADOG_AGENT_BUILDIMAGES: v55653430-4a930850 DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "_test_only" - DATADOG_AGENT_WINBUILDIMAGES: v55533027-075ad767 + DATADOG_AGENT_WINBUILDIMAGES: v55653430-4a930850 DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "_test_only" - DATADOG_AGENT_ARMBUILDIMAGES: v55533027-075ad767 + DATADOG_AGENT_ARMBUILDIMAGES: v55653430-4a930850 DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "_test_only" - DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v55533027-075ad767 + DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v55653430-4a930850 DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "_test_only" - DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v55533027-075ad767 + DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v55653430-4a930850 # New images to enable different version per image - not used yet - CI_IMAGE_BTF_GEN: v55533027-075ad767 + CI_IMAGE_BTF_GEN: v55653430-4a930850 CI_IMAGE_BTF_GEN_SUFFIX: "_test_only" - CI_IMAGE_DEB_X64: v55533027-075ad767 + CI_IMAGE_DEB_X64: v55653430-4a930850 CI_IMAGE_DEB_X64_SUFFIX: "_test_only" - CI_IMAGE_DEB_ARM64: v55533027-075ad767 + CI_IMAGE_DEB_ARM64: v55653430-4a930850 CI_IMAGE_DEB_ARM64_SUFFIX: "_test_only" - CI_IMAGE_DEB_ARMHF: v55533027-075ad767 + CI_IMAGE_DEB_ARMHF: v55653430-4a930850 CI_IMAGE_DEB_ARMHF_SUFFIX: "_test_only" - CI_IMAGE_DD_AGENT_TESTING: v55533027-075ad767 + CI_IMAGE_DD_AGENT_TESTING: v55653430-4a930850 CI_IMAGE_DD_AGENT_TESTING_SUFFIX: "_test_only" - CI_IMAGE_DOCKER_X64: v55533027-075ad767 + CI_IMAGE_DOCKER_X64: v55653430-4a930850 CI_IMAGE_DOCKER_X64_SUFFIX: "_test_only" - CI_IMAGE_DOCKER_ARM64: v55533027-075ad767 + CI_IMAGE_DOCKER_ARM64: v55653430-4a930850 CI_IMAGE_DOCKER_ARM64_SUFFIX: "_test_only" - CI_IMAGE_GITLAB_AGENT_DEPLOY: v55533027-075ad767 + CI_IMAGE_GITLAB_AGENT_DEPLOY: v55653430-4a930850 CI_IMAGE_GITLAB_AGENT_DEPLOY_SUFFIX: "_test_only" - CI_IMAGE_LINUX_GLIBC_2_17_X64: v55533027-075ad767 + CI_IMAGE_LINUX_GLIBC_2_17_X64: v55653430-4a930850 CI_IMAGE_LINUX_GLIBC_2_17_X64_SUFFIX: "_test_only" - CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v55533027-075ad767 + CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v55653430-4a930850 CI_IMAGE_LINUX_GLIBC_2_23_ARM64_SUFFIX: "_test_only" - CI_IMAGE_SYSTEM_PROBE_X64: v55533027-075ad767 + CI_IMAGE_SYSTEM_PROBE_X64: v55653430-4a930850 CI_IMAGE_SYSTEM_PROBE_X64_SUFFIX: "_test_only" - CI_IMAGE_SYSTEM_PROBE_ARM64: v55533027-075ad767 + CI_IMAGE_SYSTEM_PROBE_ARM64: v55653430-4a930850 CI_IMAGE_SYSTEM_PROBE_ARM64_SUFFIX: "_test_only" - CI_IMAGE_RPM_X64: v55533027-075ad767 + CI_IMAGE_RPM_X64: v55653430-4a930850 CI_IMAGE_RPM_X64_SUFFIX: "_test_only" - CI_IMAGE_RPM_ARM64: v55533027-075ad767 + CI_IMAGE_RPM_ARM64: v55653430-4a930850 CI_IMAGE_RPM_ARM64_SUFFIX: "_test_only" - CI_IMAGE_RPM_ARMHF: v55533027-075ad767 + CI_IMAGE_RPM_ARMHF: v55653430-4a930850 CI_IMAGE_RPM_ARMHF_SUFFIX: "_test_only" - CI_IMAGE_WIN_1809_X64: v55533027-075ad767 + CI_IMAGE_WIN_1809_X64: v55653430-4a930850 CI_IMAGE_WIN_1809_X64_SUFFIX: "_test_only" - CI_IMAGE_WIN_LTSC2022_X64: v55533027-075ad767 + CI_IMAGE_WIN_LTSC2022_X64: v55653430-4a930850 CI_IMAGE_WIN_LTSC2022_X64_SUFFIX: "_test_only" DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded From 0d2e64c079119cededfa05b29c200bf03d6b01e1 Mon Sep 17 00:00:00 2001 From: Jeremy Hanna Date: Wed, 12 Feb 2025 20:39:13 -0500 Subject: [PATCH 3/4] Update buildimages to v55763128-d62c2509 latest main commit --- .circleci/config.yml | 2 +- .gitlab-ci.yml | 44 ++++++++++++++++++++++---------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3ec1597ce9e454..1e77e0b9f49621 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,7 +15,7 @@ experimental: templates: job_template: &job_template docker: - - image: gcr.io/datadoghq/agent-circleci-runner:v55677206-ea52e48c + - image: gcr.io/datadoghq/agent-circleci-runner:v55763128-d62c2509 environment: USE_SYSTEM_LIBS: "1" working_directory: /go/src/github.com/DataDog/datadog-agent diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 36140fcd86b736..ad8a84e7f406be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -170,49 +170,49 @@ variables: # To use images from datadog-agent-buildimages dev branches, set the corresponding # SUFFIX variable to _test_only DATADOG_AGENT_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_BUILDIMAGES: v55677206-ea52e48c + DATADOG_AGENT_BUILDIMAGES: v55763128-d62c2509 DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_WINBUILDIMAGES: v55677206-ea52e48c + DATADOG_AGENT_WINBUILDIMAGES: v55763128-d62c2509 DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_ARMBUILDIMAGES: v55677206-ea52e48c + DATADOG_AGENT_ARMBUILDIMAGES: v55763128-d62c2509 DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v55677206-ea52e48c + DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v55763128-d62c2509 DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v55677206-ea52e48c + DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v55763128-d62c2509 # New images to enable different version per image - not used yet - CI_IMAGE_BTF_GEN: v55677206-ea52e48c + CI_IMAGE_BTF_GEN: v55763128-d62c2509 CI_IMAGE_BTF_GEN_SUFFIX: "" - CI_IMAGE_DEB_X64: v55677206-ea52e48c + CI_IMAGE_DEB_X64: v55763128-d62c2509 CI_IMAGE_DEB_X64_SUFFIX: "" - CI_IMAGE_DEB_ARM64: v55677206-ea52e48c + CI_IMAGE_DEB_ARM64: v55763128-d62c2509 CI_IMAGE_DEB_ARM64_SUFFIX: "" - CI_IMAGE_DEB_ARMHF: v55677206-ea52e48c + CI_IMAGE_DEB_ARMHF: v55763128-d62c2509 CI_IMAGE_DEB_ARMHF_SUFFIX: "" - CI_IMAGE_DD_AGENT_TESTING: v55677206-ea52e48c + CI_IMAGE_DD_AGENT_TESTING: v55763128-d62c2509 CI_IMAGE_DD_AGENT_TESTING_SUFFIX: "" - CI_IMAGE_DOCKER_X64: v55677206-ea52e48c + CI_IMAGE_DOCKER_X64: v55763128-d62c2509 CI_IMAGE_DOCKER_X64_SUFFIX: "" - CI_IMAGE_DOCKER_ARM64: v55677206-ea52e48c + CI_IMAGE_DOCKER_ARM64: v55763128-d62c2509 CI_IMAGE_DOCKER_ARM64_SUFFIX: "" - CI_IMAGE_GITLAB_AGENT_DEPLOY: v55677206-ea52e48c + CI_IMAGE_GITLAB_AGENT_DEPLOY: v55763128-d62c2509 CI_IMAGE_GITLAB_AGENT_DEPLOY_SUFFIX: "" - CI_IMAGE_LINUX_GLIBC_2_17_X64: v55677206-ea52e48c + CI_IMAGE_LINUX_GLIBC_2_17_X64: v55763128-d62c2509 CI_IMAGE_LINUX_GLIBC_2_17_X64_SUFFIX: "" - CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v55677206-ea52e48c + CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v55763128-d62c2509 CI_IMAGE_LINUX_GLIBC_2_23_ARM64_SUFFIX: "" - CI_IMAGE_SYSTEM_PROBE_X64: v55677206-ea52e48c + CI_IMAGE_SYSTEM_PROBE_X64: v55763128-d62c2509 CI_IMAGE_SYSTEM_PROBE_X64_SUFFIX: "" - CI_IMAGE_SYSTEM_PROBE_ARM64: v55677206-ea52e48c + CI_IMAGE_SYSTEM_PROBE_ARM64: v55763128-d62c2509 CI_IMAGE_SYSTEM_PROBE_ARM64_SUFFIX: "" - CI_IMAGE_RPM_X64: v55677206-ea52e48c + CI_IMAGE_RPM_X64: v55763128-d62c2509 CI_IMAGE_RPM_X64_SUFFIX: "" - CI_IMAGE_RPM_ARM64: v55677206-ea52e48c + CI_IMAGE_RPM_ARM64: v55763128-d62c2509 CI_IMAGE_RPM_ARM64_SUFFIX: "" - CI_IMAGE_RPM_ARMHF: v55677206-ea52e48c + CI_IMAGE_RPM_ARMHF: v55763128-d62c2509 CI_IMAGE_RPM_ARMHF_SUFFIX: "" - CI_IMAGE_WIN_1809_X64: v55677206-ea52e48c + CI_IMAGE_WIN_1809_X64: v55763128-d62c2509 CI_IMAGE_WIN_1809_X64_SUFFIX: "" - CI_IMAGE_WIN_LTSC2022_X64: v55677206-ea52e48c + CI_IMAGE_WIN_LTSC2022_X64: v55763128-d62c2509 CI_IMAGE_WIN_LTSC2022_X64_SUFFIX: "" DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded From cecc62dea0ac74cd7edba5e39c2169165b128860 Mon Sep 17 00:00:00 2001 From: Jeremy Hanna Date: Wed, 12 Feb 2025 22:28:00 -0500 Subject: [PATCH 4/4] Use correct main branch pipeline buildimage tag --- .circleci/config.yml | 2 +- .gitlab-ci.yml | 44 ++++++++++++++++++++++---------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1e77e0b9f49621..8630c9fa58047d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,7 +15,7 @@ experimental: templates: job_template: &job_template docker: - - image: gcr.io/datadoghq/agent-circleci-runner:v55763128-d62c2509 + - image: gcr.io/datadoghq/agent-circleci-runner:v55750746-d62c2509 environment: USE_SYSTEM_LIBS: "1" working_directory: /go/src/github.com/DataDog/datadog-agent diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad8a84e7f406be..3fd9b1b956a3d9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -170,49 +170,49 @@ variables: # To use images from datadog-agent-buildimages dev branches, set the corresponding # SUFFIX variable to _test_only DATADOG_AGENT_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_BUILDIMAGES: v55763128-d62c2509 + DATADOG_AGENT_BUILDIMAGES: v55750746-d62c2509 DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_WINBUILDIMAGES: v55763128-d62c2509 + DATADOG_AGENT_WINBUILDIMAGES: v55750746-d62c2509 DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_ARMBUILDIMAGES: v55763128-d62c2509 + DATADOG_AGENT_ARMBUILDIMAGES: v55750746-d62c2509 DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v55763128-d62c2509 + DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v55750746-d62c2509 DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v55763128-d62c2509 + DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v55750746-d62c2509 # New images to enable different version per image - not used yet - CI_IMAGE_BTF_GEN: v55763128-d62c2509 + CI_IMAGE_BTF_GEN: v55750746-d62c2509 CI_IMAGE_BTF_GEN_SUFFIX: "" - CI_IMAGE_DEB_X64: v55763128-d62c2509 + CI_IMAGE_DEB_X64: v55750746-d62c2509 CI_IMAGE_DEB_X64_SUFFIX: "" - CI_IMAGE_DEB_ARM64: v55763128-d62c2509 + CI_IMAGE_DEB_ARM64: v55750746-d62c2509 CI_IMAGE_DEB_ARM64_SUFFIX: "" - CI_IMAGE_DEB_ARMHF: v55763128-d62c2509 + CI_IMAGE_DEB_ARMHF: v55750746-d62c2509 CI_IMAGE_DEB_ARMHF_SUFFIX: "" - CI_IMAGE_DD_AGENT_TESTING: v55763128-d62c2509 + CI_IMAGE_DD_AGENT_TESTING: v55750746-d62c2509 CI_IMAGE_DD_AGENT_TESTING_SUFFIX: "" - CI_IMAGE_DOCKER_X64: v55763128-d62c2509 + CI_IMAGE_DOCKER_X64: v55750746-d62c2509 CI_IMAGE_DOCKER_X64_SUFFIX: "" - CI_IMAGE_DOCKER_ARM64: v55763128-d62c2509 + CI_IMAGE_DOCKER_ARM64: v55750746-d62c2509 CI_IMAGE_DOCKER_ARM64_SUFFIX: "" - CI_IMAGE_GITLAB_AGENT_DEPLOY: v55763128-d62c2509 + CI_IMAGE_GITLAB_AGENT_DEPLOY: v55750746-d62c2509 CI_IMAGE_GITLAB_AGENT_DEPLOY_SUFFIX: "" - CI_IMAGE_LINUX_GLIBC_2_17_X64: v55763128-d62c2509 + CI_IMAGE_LINUX_GLIBC_2_17_X64: v55750746-d62c2509 CI_IMAGE_LINUX_GLIBC_2_17_X64_SUFFIX: "" - CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v55763128-d62c2509 + CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v55750746-d62c2509 CI_IMAGE_LINUX_GLIBC_2_23_ARM64_SUFFIX: "" - CI_IMAGE_SYSTEM_PROBE_X64: v55763128-d62c2509 + CI_IMAGE_SYSTEM_PROBE_X64: v55750746-d62c2509 CI_IMAGE_SYSTEM_PROBE_X64_SUFFIX: "" - CI_IMAGE_SYSTEM_PROBE_ARM64: v55763128-d62c2509 + CI_IMAGE_SYSTEM_PROBE_ARM64: v55750746-d62c2509 CI_IMAGE_SYSTEM_PROBE_ARM64_SUFFIX: "" - CI_IMAGE_RPM_X64: v55763128-d62c2509 + CI_IMAGE_RPM_X64: v55750746-d62c2509 CI_IMAGE_RPM_X64_SUFFIX: "" - CI_IMAGE_RPM_ARM64: v55763128-d62c2509 + CI_IMAGE_RPM_ARM64: v55750746-d62c2509 CI_IMAGE_RPM_ARM64_SUFFIX: "" - CI_IMAGE_RPM_ARMHF: v55763128-d62c2509 + CI_IMAGE_RPM_ARMHF: v55750746-d62c2509 CI_IMAGE_RPM_ARMHF_SUFFIX: "" - CI_IMAGE_WIN_1809_X64: v55763128-d62c2509 + CI_IMAGE_WIN_1809_X64: v55750746-d62c2509 CI_IMAGE_WIN_1809_X64_SUFFIX: "" - CI_IMAGE_WIN_LTSC2022_X64: v55763128-d62c2509 + CI_IMAGE_WIN_LTSC2022_X64: v55750746-d62c2509 CI_IMAGE_WIN_LTSC2022_X64_SUFFIX: "" DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded