From 9723c6186548dcb4f8db946679e71ae0702f5875 Mon Sep 17 00:00:00 2001
From: John Chrostek <john.chrostek@datadoghq.com>
Date: Wed, 8 Apr 2026 14:29:47 -0400
Subject: [PATCH 1/2] fix: increase bottlecap compile timeout and add retries
 to integration tests

- Increase bottlecap compile job timeout from 10m to 20m to reduce false timeout failures
- Add retry: 2 to integration-suite to handle transient AWS/Datadog API throttling

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
---
 .gitlab/templates/pipeline.yaml.tpl | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/.gitlab/templates/pipeline.yaml.tpl b/.gitlab/templates/pipeline.yaml.tpl
index 2e37246b5..e6830706d 100644
--- a/.gitlab/templates/pipeline.yaml.tpl
+++ b/.gitlab/templates/pipeline.yaml.tpl
@@ -52,15 +52,10 @@ bottlecap ({{ $flavor.name }}):
   image: registry.ddbuild.io/images/docker:20.10
   tags: ["arch:{{ $flavor.arch }}"]
   needs: []
-  # This job sometimes times out on GitLab for unclear reason.
-  # Set a short timeout with retries to work around this.
-  timeout: 10m
-  retry:
-    max: 2
-    when:
-      - stuck_or_timeout_failure
-      - runner_system_failure
-      - script_failure
+  # This job sometimes times out on GitLab for unclear reasons.
+  # Set a timeout with retries to work around this.
+  timeout: 20m
+  retry: 2
   artifacts:
     expire_in: 1 week
     paths:
@@ -464,6 +459,7 @@ integration-suite:
   stage: integration-tests
   tags: ["arch:amd64"]
   image: ${CI_DOCKER_TARGET_IMAGE}:${CI_DOCKER_TARGET_VERSION}
+  retry: 2
   parallel:
     matrix:
       - TEST_SUITE: {{ range (ds "test_suites").test_suites }}

From 0e5915a531e779b28f5d5fb94589bc3e69f8fbdc Mon Sep 17 00:00:00 2001
From: John Chrostek <john.chrostek@datadoghq.com>
Date: Wed, 8 Apr 2026 14:32:08 -0400
Subject: [PATCH 2/2] fix: restore explicit when conditions for bottlecap
 compile retry

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
---
 .gitlab/templates/pipeline.yaml.tpl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.gitlab/templates/pipeline.yaml.tpl b/.gitlab/templates/pipeline.yaml.tpl
index e6830706d..6b2938221 100644
--- a/.gitlab/templates/pipeline.yaml.tpl
+++ b/.gitlab/templates/pipeline.yaml.tpl
@@ -55,7 +55,12 @@ bottlecap ({{ $flavor.name }}):
   # This job sometimes times out on GitLab for unclear reasons.
   # Set a timeout with retries to work around this.
   timeout: 20m
-  retry: 2
+  retry:
+    max: 2
+    when:
+      - stuck_or_timeout_failure
+      - runner_system_failure
+      - script_failure
   artifacts:
     expire_in: 1 week
     paths: