Backport 17984 to 4.10

.gitlab-ci.yml

@@ -3,9 +3,8 @@ stages:
   - tests
   - system-tests
   - fuzz
-  - shared-pipeline
   - benchmarks
-  - release
+  - shared-pipeline
 
 variables:
   REPO_LANG: python # "python" is used everywhere rather than "py"
@@ -150,7 +149,6 @@ serverless lambda tests:
   extends: .testrunner
   stage: tests
   needs: []
-  script:
   script:
     - |
       echo -e "\e[0Ksection_start:`date +%s`:sg_test[collapsed=true]\r\e[0KValidate ast-grep rules"
@@ -398,7 +396,6 @@ detect_circular_imports:
     - ./post-pr-comment.sh "Circular import analysis" cycles_report.txt
     - exit $COMPARE_EXIT
 
-
 "summarize failures":
   stage: .post
   extends: .testrunner
@@ -448,46 +445,16 @@ package-oci:
     - job: "download_dependency_wheels"
       artifacts: true
 
-promote-oci-to-prod:
-  stage: release
-  rules:
-    - if: !reference [.is_non_rc_release]
-      when: on_success
-    - when: never
-  needs:
-    - job: release_pypi_prod
-    - job: package-oci
-      artifacts: true
-    - job: oci-internal-publish
-      artifacts: true
-
-promote-oci-to-prod-beta:
-  stage: release
-  needs:
-    - job: package-oci
-      artifacts: true
-    - job: oci-internal-publish
-      artifacts: true
-
-promote-oci-to-staging:
-  stage: release
-  needs:
-    - job: package-oci
-      artifacts: true
-    - job: oci-internal-publish
-      artifacts: true
-
-publish-lib-init-pinned-tags:
-  stage: release
-  rules:
-    - if: !reference [.is_non_rc_release]
-      when: on_success
-    - when: never
+publishing-gate:
   needs:
+    - job: system_tests
+    - job: lib_injection_tests
+    - job: macrobenchmarks
+    - job: microbenchmarks
+    - job: serverless lambda tests
+    - job: run-tests-trigger
     - job: release_pypi_prod
-    - job: create-multiarch-lib-injection-image
-    - job: generate-lib-init-pinned-tag-values
-      artifacts: true
+      optional: true
 
 configure_system_tests:
   needs: []

.gitlab/package.yml

@@ -335,7 +335,7 @@ download_dependency_wheels:
 # Upload ELF debug symbols to the Datadog symbols backend for crashtracker symbolication.
 # Runs automatically on releases/RCs, available as manual trigger for other pipelines.
 "upload debug symbols to backend":
-  stage: release
+  stage: .post
   extends: .testrunner
   needs:
     - job: "build linux"

.gitlab/release.yml

@@ -2,12 +2,11 @@ variables:
   PYPI_PUBLISH_IMAGE: registry.ddbuild.io/images/mirror/python:3.12.0
 
 .release_base:
-  stage: release
+  stage: shared-pipeline
   rules:
     - if: !reference [.is_release]
       when: on_success
     - when: never
-  dependencies: [ "ddtrace package" ]
 
 .release_pypi:
   extends: .release_base
@@ -31,6 +30,9 @@ variables:
     paths:
       - pywheels/*.whl
       - pywheels/*.tar.gz
+  needs:
+    - job: "ddtrace package"
+      artifacts: true
 
 # Can be used to validate uploading of artifacts
 # release_pypi_test:
@@ -42,6 +44,18 @@ release_pypi_prod:
   extends: .release_pypi
   variables:
     PYPI_REPOSITORY: pypi
+  needs:
+    - job: "ddtrace package"
+      artifacts: true
+    - job: system_tests
+    - job: lib_injection_tests
+    - job: macrobenchmarks
+    - job: microbenchmarks
+    - job: serverless lambda tests
+    - job: run-tests-trigger
+    - job: requirements_json_test
+    - job: generate-lib-init-pinned-tag-values
+    - job: deploy_to_reliability_env
 
 notify_datadog_release:
   extends: .release_base