From 9154809f38b12d394f175bf97c04cd716d5b444d Mon Sep 17 00:00:00 2001
From: Alexandre Rulleau <alexandre.rulleau@datadoghq.com>
Date: Thu, 26 Feb 2026 18:11:40 +0100
Subject: [PATCH 1/2] ci: suppress package-oci in parent pipeline

Commit a3409cd78 included one-pipeline.locked.yml in the parent pipeline
to get the supported-configurations validation job templates. This
accidentally also brought in the package-oci job, which has no needs:
and therefore no access to the package loader artifacts.

Before that commit, package-oci only ran in the child pipeline
(package-gen.yml) where generate-package.php overrides its needs: to
depend on the package loader jobs. The fix restores the original
behavior by suppressing package-oci in the parent pipeline.
---
 .gitlab-ci.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 139c49c576..3503e09cc3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -98,6 +98,13 @@ package-trigger:
     NIGHTLY_BUILD: $NIGHTLY_BUILD
     RELIABILITY_ENV_BRANCH: $RELIABILITY_ENV_BRANCH
 
+# package-oci runs in the child pipeline (package-gen.yml) with the correct
+# needs: [package loader] override. The parent pipeline doesn't have package
+# loader artifacts, so we suppress it here.
+package-oci:
+  rules:
+    - when: never
+
 validate_supported_configurations_v2_local_file:
   needs: []
   extends: .validate_supported_configurations_v2_local_file

From 45910a19e058e8a82ca315f9da51f27119e3a2c6 Mon Sep 17 00:00:00 2001
From: Alexandre Rulleau <alexandre.rulleau@datadoghq.com>
Date: Thu, 26 Feb 2026 22:48:20 +0100
Subject: [PATCH 2/2] ci: suppress package-oci in parent pipeline

Commit a3409cd78 included one-pipeline.locked.yml in the parent pipeline
to get the supported-configurations validation job templates. This
accidentally also brought in shared-pipeline jobs (package-oci and its
downstream) which have no access to the package loader artifacts.

Fix: set SKIP_SHARED_PIPELINE=true globally in the parent pipeline so
all shared-pipeline jobs from one-pipeline.yml that check this variable
are suppressed. Override it to false in package-trigger so the child
pipeline (package-gen.yml) still runs package-oci correctly with its
needs: [package loader] override.

Also suppress requirements_json_test explicitly since it does not check
SKIP_SHARED_PIPELINE (it only checks DANGEROUSLY_SKIP_SHARED_PIPELINE_TESTS).
It runs correctly in the child pipeline via generate-package.php overrides.
---
 .gitlab-ci.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3503e09cc3..500eb46da0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,11 @@ variables:
   GIT_SUBMODULE_STRATEGY: recursive
   # Only clone libdatadog submodule by default
   GIT_SUBMODULE_PATHS: libdatadog
+  # Suppress shared-pipeline jobs (package-oci and its downstream) in the
+  # parent pipeline. They run in the child pipeline (package-gen.yml) where
+  # package loader artifacts are available. Override to "false" in
+  # package-trigger so the child pipeline runs them correctly.
+  SKIP_SHARED_PIPELINE: "true"
   RELIABILITY_ENV_BRANCH:
     value: "master"
     description: "Run a specific datadog-reliability-env branch downstream"
@@ -97,11 +102,10 @@ package-trigger:
     GIT_SUBMODULE_PATHS: libdatadog appsec/third_party/cpp-base64 appsec/third_party/libddwaf appsec/third_party/msgpack-c
     NIGHTLY_BUILD: $NIGHTLY_BUILD
     RELIABILITY_ENV_BRANCH: $RELIABILITY_ENV_BRANCH
+    SKIP_SHARED_PIPELINE: "false"
 
-# package-oci runs in the child pipeline (package-gen.yml) with the correct
-# needs: [package loader] override. The parent pipeline doesn't have package
-# loader artifacts, so we suppress it here.
-package-oci:
+# requirements_json_test doesn't check SKIP_SHARED_PIPELINE, suppress explicitly
+requirements_json_test:
   rules:
     - when: never