ci: move one-pipeline jobs to shared child pipeline (#3688)

Leiyks · web-flow · commit eebb4fe5ccc3 · 2026-03-05T14:26:30.000+01:00
Instead of including one-pipeline.locked.yml in the parent pipeline (which caused package-oci and other shared-pipeline jobs to leak into the parent), move the two supported-configurations validation jobs to generate-shared.php where the shared-pipeline include belongs. This removes all SKIP_SHARED_PIPELINE workarounds that were added as a band-aid in #3679, #3682, and supersedes #3687. The validate_supported_configurations_v2_local_file and update_central_configurations_version_range_v2 jobs now run in the shared-trigger child pipeline (shared-gen.yml), which includes one-pipeline.locked.yml for the required job templates.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,19 +1,13 @@
 stages:
   - build
   - tests
-  - shared-pipeline
   - deploy
   - ci-build
 
 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"
@@ -23,7 +17,6 @@ include:
   - project: DataDog/apm-reliability/libdatadog-build
     ref: 5826819695d93286569e70ed087ae6bf906ce2c3
     file: templates/ci_authenticated_job.yml
-  - local: .gitlab/one-pipeline.locked.yml
   - local: .gitlab/ci-images.yml
 
 generate-templates:
@@ -102,28 +95,3 @@ 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"
-
-deploy_to_reliability_env:
-  variables:
-    SKIP_SHARED_PIPELINE: "false"
-
-# requirements_json_test doesn't check SKIP_SHARED_PIPELINE, suppress explicitly
-requirements_json_test:
-  rules:
-    - when: never
-
-validate_supported_configurations_v2_local_file:
-  needs: []
-  extends: .validate_supported_configurations_v2_local_file
-  variables:
-    LOCAL_JSON_PATH: "metadata/supported-configurations.json"
-    BACKFILLED: "true"
-
-update_central_configurations_version_range_v2:
-  extends: .update_central_configurations_version_range_v2
-  variables:
-    LOCAL_REPO_NAME: "dd-trace-php"
-    LOCAL_JSON_PATH: "metadata/supported-configurations.json"
-    LANGUAGE_NAME: "php"
-    MULTIPLE_RELEASE_LINES: "false"
diff --git a/.gitlab/generate-package.php b/.gitlab/generate-package.php
@@ -96,6 +96,21 @@
   - local: .gitlab/benchmarks.yml
 
 # One pipeline job overrides
+validate_supported_configurations_v2_local_file:
+  needs: []
+  extends: .validate_supported_configurations_v2_local_file
+  variables:
+    LOCAL_JSON_PATH: "metadata/supported-configurations.json"
+    BACKFILLED: "true"
+
+update_central_configurations_version_range_v2:
+  extends: .update_central_configurations_version_range_v2
+  variables:
+    LOCAL_REPO_NAME: "dd-trace-php"
+    LOCAL_JSON_PATH: "metadata/supported-configurations.json"
+    LANGUAGE_NAME: "php"
+    MULTIPLE_RELEASE_LINES: "false"
+
 configure_system_tests:
   variables:
     SYSTEM_TESTS_SCENARIOS_GROUPS: "simple_onboarding,simple_onboarding_profiling,simple_onboarding_appsec,lib-injection,lib-injection-profiling,docker-ssi"
