From b43fe23d5d4e0823cdb0bab863e3c0480365f141 Mon Sep 17 00:00:00 2001 From: Nicolas Schweitzer Date: Tue, 8 Oct 2024 11:52:44 +0200 Subject: [PATCH 01/12] fix(images): Set a new image for agent6 --- .circleci/config.yml | 2 +- .gitlab-ci.yml | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8a344ecdd6f96..909a7f8e5ef55 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:v32015963-09a32ddb + - image: gcr.io/datadoghq/agent-circleci-runner_test_only:v45971236-dbff5115 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 0856cddb9ef58..17ac949d6e554 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -160,20 +160,20 @@ 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: v32015963-09a32ddb - DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_WINBUILDIMAGES: v32015963-09a32ddb - DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_ARMBUILDIMAGES: v32015963-09a32ddb - DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v32015963-09a32ddb - DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES: v32015963-09a32ddb - DATADOG_AGENT_NIKOS_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_NIKOS_BUILDIMAGES: v32015963-09a32ddb - DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v32015963-09a32ddb + DATADOG_AGENT_BUILDIMAGES_SUFFIX: "_test_only" + DATADOG_AGENT_BUILDIMAGES: v45971236-dbff5115 + DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "_test_only" + DATADOG_AGENT_WINBUILDIMAGES: v45971236-dbff5115 + DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "_test_only" + DATADOG_AGENT_ARMBUILDIMAGES: v45971236-dbff5115 + DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "_test_only" + DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v45971236-dbff5115 + DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES_SUFFIX: "_test_only" + DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES: v45971236-dbff5115 + DATADOG_AGENT_NIKOS_BUILDIMAGES_SUFFIX: "_test_only" + DATADOG_AGENT_NIKOS_BUILDIMAGES: v45971236-dbff5115 + DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "_test_only" + DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v45971236-dbff5115 # To use images from test-infra-definitions dev branches, set the SUFFIX variable to -dev # and check the job creating the image to make sure you have the right SHA prefix TEST_INFRA_DEFINITIONS_BUILDIMAGES_SUFFIX: "" From 04d80e366c85ed922304d3fe31c5b0722b137173 Mon Sep 17 00:00:00 2001 From: Nicolas Schweitzer Date: Tue, 8 Oct 2024 13:49:49 +0200 Subject: [PATCH 02/12] update image and gpg keys --- .gitlab-ci.yml | 6 +++--- .gitlab/source_test/linux.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 17ac949d6e554..7be6545e9eed0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -182,9 +182,9 @@ variables: DATADOG_AGENT_BUILDERS: v28719426-b6a4fd9 DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded - DEB_GPG_KEY_ID: ad9589b7 - DEB_GPG_KEY_NAME: "Datadog, Inc. Master key" - RPM_GPG_KEY_ID: fd4bf915 + DEB_GPG_KEY_ID: c0962c7d + DEB_GPG_KEY_NAME: "Datadog, Inc. APT key" + RPM_GPG_KEY_ID: b01082d3 RPM_GPG_KEY_NAME: "Datadog, Inc. RPM key" DOCKER_REGISTRY_URL: docker.io KITCHEN_INFRASTRUCTURE_FLAKES_RETRY: 2 diff --git a/.gitlab/source_test/linux.yml b/.gitlab/source_test/linux.yml index 47cfa3af1a473..5d5bb2be4202e 100644 --- a/.gitlab/source_test/linux.yml +++ b/.gitlab/source_test/linux.yml @@ -160,7 +160,7 @@ tests_rpm-x64-py2: rules: - !reference [.except_disable_unit_tests] - !reference [.on_a6] - image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/rpm_x64_testing$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES + image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/rpm_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES tags: ["arch:amd64"] variables: PYTHON_RUNTIMES: '2' @@ -171,7 +171,7 @@ tests_rpm-x64-py3: extends: - .rtloader_tests - .linux_tests_with_upload - image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/rpm_x64_testing$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES + image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/rpm_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES tags: ["arch:amd64"] variables: PYTHON_RUNTIMES: '3' From c5ba481ffbd6f634fc18c2735ffd4b84ce964d59 Mon Sep 17 00:00:00 2001 From: Nicolas Schweitzer Date: Wed, 9 Oct 2024 14:26:09 +0200 Subject: [PATCH 03/12] fix ssm variable names and use dedicated branch for macos --- .gitlab-ci.yml | 8 ++++---- release.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7be6545e9eed0..fb21ee5003553 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -211,8 +211,8 @@ variables: ARTIFACTORY_BYPASS_SSM_NAME: ci.datadog-agent.artifactory_bypass # agent-ci-experience CHANGELOG_COMMIT_SHA_SSM_NAME: ci.datadog-agent.changelog_commit_sha # agent-ci-experience CHOCOLATEY_API_KEY_SSM_NAME: ci.datadog-agent.chocolatey_api_key # windows-agent - DEB_GPG_KEY_SSM_NAME: ci.datadog-agent.deb_signing_private_key_v2_${DEB_GPG_KEY_ID} # agent-build-and-release - DEB_SIGNING_PASSPHRASE_SSM_NAME: ci.datadog-agent.deb_signing_key_passphrase_v2_${DEB_GPG_KEY_ID} # agent-build-and-release + DEB_GPG_KEY_SSM_NAME: ci.datadog-agent.deb_signing_private_key_${DEB_GPG_KEY_ID} # agent-build-and-release + DEB_SIGNING_PASSPHRASE_SSM_NAME: ci.datadog-agent.deb_signing_key_passphrase_${DEB_GPG_KEY_ID} # agent-build-and-release DOCKER_REGISTRY_LOGIN_SSM_KEY: ci.datadog-agent.docker_hub_login # agent-ci-experience DOCKER_REGISTRY_PWD_SSM_KEY: ci.datadog-agent.docker_hub_pwd # agent-ci-experience E2E_TESTS_API_KEY_SSM_NAME: ci.datadog-agent.e2e_tests_api_key # agent-developer-tools @@ -230,8 +230,8 @@ variables: MACOS_GITHUB_APP_ID_SSM_NAME: ci.datadog-agent.macos_github_app_id # agent-ci-experience MACOS_GITHUB_INSTALLATION_ID_SSM_NAME: ci.datadog-agent.macos_github_installation_id # agent-ci-experience MACOS_GITHUB_KEY_SSM_NAME: ci.datadog-agent.macos_github_key_b64 # agent-ci-experience - RPM_GPG_KEY_SSM_NAME: ci.datadog-agent.rpm_signing_private_key_v2_${RPM_GPG_KEY_ID} # agent-build-and-release - RPM_SIGNING_PASSPHRASE_SSM_NAME: ci.datadog-agent.rpm_signing_key_passphrase_v2_${RPM_GPG_KEY_ID} # agent-build-and-release + RPM_GPG_KEY_SSM_NAME: ci.datadog-agent.rpm_signing_private_key_${RPM_GPG_KEY_ID} # agent-build-and-release + RPM_SIGNING_PASSPHRASE_SSM_NAME: ci.datadog-agent.rpm_signing_key_passphrase_${RPM_GPG_KEY_ID} # agent-build-and-release SMP_ACCOUNT_ID_SSM_NAME: ci.datadog-agent.single-machine-performance-account-id # single-machine-performance SMP_AGENT_TEAM_ID_SSM_NAME: ci.datadog-agent.single-machine-performance-agent-team-id # single-machine-performance SMP_API_SSM_NAME: ci.datadog-agent.single-machine-performance-api # single-machine-performance diff --git a/release.json b/release.json index 414621609f64a..477d75195ea86 100644 --- a/release.json +++ b/release.json @@ -11,7 +11,7 @@ "OMNIBUS_RUBY_VERSION": "7.53.x", "JMXFETCH_VERSION": "0.49.0", "JMXFETCH_HASH": "b5c2c3ff27603f469bb11961d559f1154887963e02b9d70d5f1fc7efa527a486", - "MACOS_BUILD_VERSION": "7.53.x", + "MACOS_BUILD_VERSION": "nschweitzer/master", "WINDOWS_DDNPM_DRIVER": "release-signed", "WINDOWS_DDNPM_VERSION": "2.6.0", "WINDOWS_DDNPM_SHASUM": "b1611ad4ceb8366c88767aeb638abefb226081efbf546b8b886952dd1b18ec05", @@ -30,7 +30,7 @@ "OMNIBUS_RUBY_VERSION": "7.53.x", "JMXFETCH_VERSION": "0.49.0", "JMXFETCH_HASH": "b5c2c3ff27603f469bb11961d559f1154887963e02b9d70d5f1fc7efa527a486", - "MACOS_BUILD_VERSION": "7.53.x", + "MACOS_BUILD_VERSION": "nschweitzer/master", "WINDOWS_DDNPM_DRIVER": "release-signed", "WINDOWS_DDNPM_VERSION": "2.6.0", "WINDOWS_DDNPM_SHASUM": "b1611ad4ceb8366c88767aeb638abefb226081efbf546b8b886952dd1b18ec05", From 2b92672aeb3985a5b848fb6c9b9a2da25eb0523f Mon Sep 17 00:00:00 2001 From: Nicolas Schweitzer Date: Wed, 9 Oct 2024 16:31:35 +0200 Subject: [PATCH 04/12] use latest version of omnibus --- release.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/release.json b/release.json index 477d75195ea86..9e0bac801293a 100644 --- a/release.json +++ b/release.json @@ -7,8 +7,8 @@ }, "nightly": { "INTEGRATIONS_CORE_VERSION": "7.53.x", - "OMNIBUS_SOFTWARE_VERSION": "7.53.x", - "OMNIBUS_RUBY_VERSION": "7.53.x", + "OMNIBUS_SOFTWARE_VERSION": "375618d70253293d71b13f9385260aa3dedd7125", + "OMNIBUS_RUBY_VERSION": "bc5e0fb395c4b106967f97f8738d23705e5bc933", "JMXFETCH_VERSION": "0.49.0", "JMXFETCH_HASH": "b5c2c3ff27603f469bb11961d559f1154887963e02b9d70d5f1fc7efa527a486", "MACOS_BUILD_VERSION": "nschweitzer/master", @@ -26,8 +26,8 @@ }, "nightly-a7": { "INTEGRATIONS_CORE_VERSION": "7.53.x", - "OMNIBUS_SOFTWARE_VERSION": "7.53.x", - "OMNIBUS_RUBY_VERSION": "7.53.x", + "OMNIBUS_SOFTWARE_VERSION": "375618d70253293d71b13f9385260aa3dedd7125", + "OMNIBUS_RUBY_VERSION": "bc5e0fb395c4b106967f97f8738d23705e5bc933", "JMXFETCH_VERSION": "0.49.0", "JMXFETCH_HASH": "b5c2c3ff27603f469bb11961d559f1154887963e02b9d70d5f1fc7efa527a486", "MACOS_BUILD_VERSION": "nschweitzer/master", From be2190b4854d4ea621fba2ad64abbc85cba7247a Mon Sep 17 00:00:00 2001 From: Nicolas Schweitzer Date: Thu, 10 Oct 2024 18:51:40 +0200 Subject: [PATCH 05/12] Remove unexpected options from the LD_RUN_PATH --- omnibus/config/software/datadog-agent-integrations-py3.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omnibus/config/software/datadog-agent-integrations-py3.rb b/omnibus/config/software/datadog-agent-integrations-py3.rb index af9d70bb1f668..ce1939d947a55 100644 --- a/omnibus/config/software/datadog-agent-integrations-py3.rb +++ b/omnibus/config/software/datadog-agent-integrations-py3.rb @@ -120,7 +120,7 @@ "CFLAGS" => "-I#{install_dir}/embedded/include -I/opt/mqm/inc", "CXXFLAGS" => "-I#{install_dir}/embedded/include -I/opt/mqm/inc", "LDFLAGS" => "-L#{install_dir}/embedded/lib -L/opt/mqm/lib64 -L/opt/mqm/lib", - "LD_RUN_PATH" => "#{install_dir}/embedded/lib -L/opt/mqm/lib64 -L/opt/mqm/lib", + "LD_RUN_PATH" => "#{install_dir}/embedded/lib", "PATH" => "#{install_dir}/embedded/bin:#{ENV['PATH']}", } From 2742dfafee65c92e405e70b53188e96802c0c496 Mon Sep 17 00:00:00 2001 From: Nicolas Schweitzer Date: Fri, 11 Oct 2024 10:38:17 +0200 Subject: [PATCH 06/12] fix version --- .gitlab/setup/setup.yml | 2 +- tasks/libs/common/utils.py | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitlab/setup/setup.yml b/.gitlab/setup/setup.yml index 27fbc51cf5290..0f6266950cb0f 100644 --- a/.gitlab/setup/setup.yml +++ b/.gitlab/setup/setup.yml @@ -5,7 +5,7 @@ setup_agent_version: tags: ["arch:amd64"] script: - source /root/.bashrc - - inv -e agent.version --version-cached + - inv -e agent.version -m 6 --version-cached - $S3_CP_CMD $CI_PROJECT_DIR/agent-version.cache $S3_ARTIFACTS_URI/agent-version.cache needs: [] diff --git a/tasks/libs/common/utils.py b/tasks/libs/common/utils.py index 2ecb55b36d502..31dee76ab07dc 100644 --- a/tasks/libs/common/utils.py +++ b/tasks/libs/common/utils.py @@ -404,7 +404,8 @@ def query_version(ctx, git_sha_length=7, prefix=None, major_version_hint=None): cmd += " --match \"[0-9]*\"" if git_sha_length and type(git_sha_length) == int: cmd += f" --abbrev={git_sha_length}" - described_version = ctx.run(cmd, hide=True).stdout.strip() + print(f"command is {cmd}") + described_version = ctx.run(cmd).stdout.strip() # for the example above, 6.0.0-beta.0-1-g4f19118, this will be 1 commit_number_match = re.match(r"^.*-(?P\d+)-g[0-9a-f]+$", described_version) @@ -474,10 +475,7 @@ def get_version( pipeline_id=None, include_git=False, include_pre=True, - fake_condition=True, ): - if fake_condition: - return "7.53.0" version = "" if pipeline_id is None: pipeline_id = os.getenv("CI_PIPELINE_ID") From aa3d5d06e83050045c1b8687ddb8ae99e37827cd Mon Sep 17 00:00:00 2001 From: Nicolas Schweitzer Date: Wed, 16 Oct 2024 11:52:12 +0200 Subject: [PATCH 07/12] Use an `official` image version --- .circleci/config.yml | 2 +- .gitlab-ci.yml | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 909a7f8e5ef55..05c4effddb771 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:v45971236-dbff5115 + - image: gcr.io/datadoghq/agent-circleci-runner:v46696172-fa8bb9ad 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 fb21ee5003553..4430988fc02a7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -160,20 +160,20 @@ 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: "_test_only" - DATADOG_AGENT_BUILDIMAGES: v45971236-dbff5115 - DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "_test_only" - DATADOG_AGENT_WINBUILDIMAGES: v45971236-dbff5115 - DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "_test_only" - DATADOG_AGENT_ARMBUILDIMAGES: v45971236-dbff5115 - DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "_test_only" - DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v45971236-dbff5115 - DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES_SUFFIX: "_test_only" - DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES: v45971236-dbff5115 - DATADOG_AGENT_NIKOS_BUILDIMAGES_SUFFIX: "_test_only" - DATADOG_AGENT_NIKOS_BUILDIMAGES: v45971236-dbff5115 - DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "_test_only" - DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v45971236-dbff5115 + DATADOG_AGENT_BUILDIMAGES_SUFFIX: "" + DATADOG_AGENT_BUILDIMAGES: v46696172-fa8bb9ad + DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "" + DATADOG_AGENT_WINBUILDIMAGES: v46696172-fa8bb9ad + DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "" + DATADOG_AGENT_ARMBUILDIMAGES: v46696172-fa8bb9ad + DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "" + DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v46696172-fa8bb9ad + DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES_SUFFIX: "" + DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES: v46696172-fa8bb9ad + DATADOG_AGENT_NIKOS_BUILDIMAGES_SUFFIX: "" + DATADOG_AGENT_NIKOS_BUILDIMAGES: v46696172-fa8bb9ad + DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "" + DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v46696172-fa8bb9ad # To use images from test-infra-definitions dev branches, set the SUFFIX variable to -dev # and check the job creating the image to make sure you have the right SHA prefix TEST_INFRA_DEFINITIONS_BUILDIMAGES_SUFFIX: "" From 63ffcce1f14674a7f34868703a4b600f6a90b8f2 Mon Sep 17 00:00:00 2001 From: Nicolas Schweitzer Date: Wed, 16 Oct 2024 15:11:39 +0200 Subject: [PATCH 08/12] prevent do-not-merge to fail --- tasks/release.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/release.py b/tasks/release.py index 89b8b4b40f7b9..6cc7c0daa7475 100644 --- a/tasks/release.py +++ b/tasks/release.py @@ -1575,7 +1575,7 @@ def cleanup(ctx): @task def check_omnibus_branches(ctx): base_branch = _get_release_json_value('base_branch') - if base_branch == 'main': + if base_branch == '6.53.x': omnibus_ruby_branch = 'datadog-5.5.0' omnibus_software_branch = 'master' else: From eda0323cc5fbd20e1697817bc4f2935dce4126c0 Mon Sep 17 00:00:00 2001 From: Nicolas Schweitzer Date: Thu, 17 Oct 2024 18:43:11 +0200 Subject: [PATCH 09/12] remove trace --- tasks/libs/common/utils.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tasks/libs/common/utils.py b/tasks/libs/common/utils.py index 31dee76ab07dc..c757ee2a412eb 100644 --- a/tasks/libs/common/utils.py +++ b/tasks/libs/common/utils.py @@ -404,8 +404,7 @@ def query_version(ctx, git_sha_length=7, prefix=None, major_version_hint=None): cmd += " --match \"[0-9]*\"" if git_sha_length and type(git_sha_length) == int: cmd += f" --abbrev={git_sha_length}" - print(f"command is {cmd}") - described_version = ctx.run(cmd).stdout.strip() + described_version = ctx.run(cmd, hide=True).stdout.strip() # for the example above, 6.0.0-beta.0-1-g4f19118, this will be 1 commit_number_match = re.match(r"^.*-(?P\d+)-g[0-9a-f]+$", described_version) From e066f98e5860aa0890603c2413c6adfe63530087 Mon Sep 17 00:00:00 2001 From: Nicolas Schweitzer Date: Fri, 18 Oct 2024 12:12:27 +0200 Subject: [PATCH 10/12] change base branch --- release.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release.json b/release.json index 9e0bac801293a..b3da66a2c1751 100644 --- a/release.json +++ b/release.json @@ -1,6 +1,6 @@ { - "base_branch": "7.53.x", - "current_milestone": "7.53.0", + "base_branch": "6.53.x", + "current_milestone": "6.53.0", "last_stable": { "6": "6.52.0", "7": "7.52.0" From a1c25c6d1370e40480ca714ed3757fb0865735e0 Mon Sep 17 00:00:00 2001 From: Nicolas Schweitzer Date: Fri, 18 Oct 2024 17:48:25 +0200 Subject: [PATCH 11/12] Revert "Use an `official` image version" This reverts commit aa3d5d06e83050045c1b8687ddb8ae99e37827cd. --- .circleci/config.yml | 2 +- .gitlab-ci.yml | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 05c4effddb771..909a7f8e5ef55 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:v46696172-fa8bb9ad + - image: gcr.io/datadoghq/agent-circleci-runner_test_only:v45971236-dbff5115 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 4430988fc02a7..fb21ee5003553 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -160,20 +160,20 @@ 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: v46696172-fa8bb9ad - DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_WINBUILDIMAGES: v46696172-fa8bb9ad - DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_ARMBUILDIMAGES: v46696172-fa8bb9ad - DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v46696172-fa8bb9ad - DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES: v46696172-fa8bb9ad - DATADOG_AGENT_NIKOS_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_NIKOS_BUILDIMAGES: v46696172-fa8bb9ad - DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v46696172-fa8bb9ad + DATADOG_AGENT_BUILDIMAGES_SUFFIX: "_test_only" + DATADOG_AGENT_BUILDIMAGES: v45971236-dbff5115 + DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "_test_only" + DATADOG_AGENT_WINBUILDIMAGES: v45971236-dbff5115 + DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "_test_only" + DATADOG_AGENT_ARMBUILDIMAGES: v45971236-dbff5115 + DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "_test_only" + DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v45971236-dbff5115 + DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES_SUFFIX: "_test_only" + DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES: v45971236-dbff5115 + DATADOG_AGENT_NIKOS_BUILDIMAGES_SUFFIX: "_test_only" + DATADOG_AGENT_NIKOS_BUILDIMAGES: v45971236-dbff5115 + DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "_test_only" + DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v45971236-dbff5115 # To use images from test-infra-definitions dev branches, set the SUFFIX variable to -dev # and check the job creating the image to make sure you have the right SHA prefix TEST_INFRA_DEFINITIONS_BUILDIMAGES_SUFFIX: "" From f893a8953a556a1dd3c8f06e0f9a1bff9ee88586 Mon Sep 17 00:00:00 2001 From: Nicolas Schweitzer Date: Wed, 30 Oct 2024 16:41:11 +0100 Subject: [PATCH 12/12] use latest agent6 images --- .circleci/config.yml | 2 +- .gitlab-ci.yml | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 909a7f8e5ef55..ebc567bc05cc0 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:v45971236-dbff5115 + - image: gcr.io/datadoghq/agent-circleci-runner:v47817366-5fdf0325 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 fb21ee5003553..644af9e70c55f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -160,20 +160,20 @@ 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: "_test_only" - DATADOG_AGENT_BUILDIMAGES: v45971236-dbff5115 - DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "_test_only" - DATADOG_AGENT_WINBUILDIMAGES: v45971236-dbff5115 - DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "_test_only" - DATADOG_AGENT_ARMBUILDIMAGES: v45971236-dbff5115 - DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "_test_only" - DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v45971236-dbff5115 - DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES_SUFFIX: "_test_only" - DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES: v45971236-dbff5115 - DATADOG_AGENT_NIKOS_BUILDIMAGES_SUFFIX: "_test_only" - DATADOG_AGENT_NIKOS_BUILDIMAGES: v45971236-dbff5115 - DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "_test_only" - DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v45971236-dbff5115 + DATADOG_AGENT_BUILDIMAGES_SUFFIX: "" + DATADOG_AGENT_BUILDIMAGES: v47817366-5fdf0325 + DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "" + DATADOG_AGENT_WINBUILDIMAGES: v47817366-5fdf0325 + DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "" + DATADOG_AGENT_ARMBUILDIMAGES: v47817366-5fdf0325 + DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "" + DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v47817366-5fdf0325 + DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES_SUFFIX: "" + DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES: v47817366-5fdf0325 + DATADOG_AGENT_NIKOS_BUILDIMAGES_SUFFIX: "" + DATADOG_AGENT_NIKOS_BUILDIMAGES: v47817366-5fdf0325 + DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "" + DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v47817366-5fdf0325 # To use images from test-infra-definitions dev branches, set the SUFFIX variable to -dev # and check the job creating the image to make sure you have the right SHA prefix TEST_INFRA_DEFINITIONS_BUILDIMAGES_SUFFIX: ""