From 3b8941b1425e673e8ee243c49a411bc9408099ed Mon Sep 17 00:00:00 2001 From: Remy Mathieu Date: Mon, 3 Jun 2024 12:07:06 +0200 Subject: [PATCH 1/2] gitlab: use newer rpm-arm64 builders --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 75ead15d5d1c5..ebba2dd0c993c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -163,8 +163,8 @@ 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: v34815905-ae40295e + DATADOG_AGENT_BUILDIMAGES_SUFFIX: "_test_only" + DATADOG_AGENT_BUILDIMAGES: v35670121-b762a0ec DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "" DATADOG_AGENT_WINBUILDIMAGES: v34815905-ae40295e DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "" From cc76f665a1ab8b62ab8eec3546116f23b0fd6694 Mon Sep 17 00:00:00 2001 From: Remy Mathieu Date: Tue, 4 Jun 2024 13:09:57 +0200 Subject: [PATCH 2/2] Upgrade builders images. --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ebba2dd0c993c..a885262a5b1e2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -163,16 +163,16 @@ 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: v35670121-b762a0ec + DATADOG_AGENT_BUILDIMAGES_SUFFIX: "" + DATADOG_AGENT_BUILDIMAGES: v35780738-bbc50efc DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_WINBUILDIMAGES: v34815905-ae40295e + DATADOG_AGENT_WINBUILDIMAGES: v35780738-bbc50efc DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_ARMBUILDIMAGES: v34815905-ae40295e + DATADOG_AGENT_ARMBUILDIMAGES: v35780738-bbc50efc DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v34815905-ae40295e + DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v35780738-bbc50efc DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v34815905-ae40295e + DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v35780738-bbc50efc DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded DEB_GPG_KEY_ID: c0962c7d