ci(benchmarks): group benchmarks into parent-child pipelines to ease retrigerring (#12390)

Clean up Gitlab benchmarking pipeline in order to ease retrigerring in
Gitlab UI.

Author: ddyurchenko

Diff for: .gitlab-ci.yml

@@ -3,8 +3,6 @@ stages:
   - tests
   - shared-pipeline
   - benchmarks
-  - macrobenchmarks
-  - benchmarks-report
   - release
 
 variables:
@@ -17,11 +15,10 @@ default:
 include:
   - remote: https://gitlab-templates.ddbuild.io/libdatadog/include/one-pipeline.yml
   - local: ".gitlab/services.yml" # Include early so others can use the definitions
-  - local: ".gitlab/benchmarks.yml"
   - local: ".gitlab/package.yml"
-  - local: ".gitlab/macrobenchmarks.yml"
   - local: ".gitlab/release.yml"
   - local: ".gitlab/testrunner.yml"
+  - local: ".gitlab/benchmarks/serverless.yml"
 
 tests-gen:
   stage: tests
@@ -43,6 +40,24 @@ run-tests-trigger:
      - artifact: .gitlab/tests-gen.yml
        job: tests-gen
    strategy: depend
+   
+microbenchmarks:
+  stage: benchmarks
+  needs: [ ]
+  trigger:
+    include: .gitlab/benchmarks/microbenchmarks.yml
+    strategy: depend
+   
+macrobenchmarks:
+  stage: benchmarks
+  needs: [ ]
+  trigger:
+    include: .gitlab/benchmarks/macrobenchmarks.yml
+  allow_failure: true
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "schedule"
+      when: always
+    - when: manual
 
 check_new_flaky_tests:
   stage: tests

Diff for: .gitlab/macrobenchmarks.yml renamed to .gitlab/benchmarks/macrobenchmarks.yml

@@ -1,8 +1,11 @@
+stages:
+  - test
+
 variables:
   MACROBENCHMARKS_CI_IMAGE: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/benchmarking-platform:dd-trace-py-macrobenchmarks
 
 .macrobenchmarks:
-  stage: macrobenchmarks
+  stage: test
   needs: []
   tags: ["runner:apm-k8s-same-cpu"]
   timeout: 1h
@@ -14,14 +17,7 @@ variables:
       - runner_system_failure
       - scheduler_failure
       - api_failure
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-      when: always
-    - when: manual
-    ## Next step, enable:
-    # - if: $CI_COMMIT_REF_NAME == "main"
-    #   when: always
-  # If you have a problem with Gitlab cache, see Troubleshooting section in Benchmarking Platform docs
+  when: on_success
   image: $MACROBENCHMARKS_CI_IMAGE
   script: |
     git clone --branch python/macrobenchmarks https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/benchmarking-platform platform && cd platform

Diff for: .gitlab/benchmarks.yml renamed to .gitlab/benchmarks/microbenchmarks.yml

@@ -1,9 +1,12 @@
+stages:
+  - test
+  - report
+
 variables:
   MICROBENCHMARKS_CI_IMAGE: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/benchmarking-platform:dd-trace-py
-  SLS_CI_IMAGE: registry.ddbuild.io/ci/serverless-tools:1
 
 .benchmarks:
-  stage: benchmarks
+  stage: test
   when: on_success
   tags: ["runner:apm-k8s-tweaked-metal"]
   image: $MICROBENCHMARKS_CI_IMAGE
@@ -60,7 +63,7 @@ microbenchmarks:
 benchmarks-pr-comment:
   image: $MICROBENCHMARKS_CI_IMAGE
   tags: ["arch:amd64"]
-  stage: benchmarks-report
+  stage: report
   when: always
   script:
     - export REPORTS_DIR="$(pwd)/reports/" && (mkdir "${REPORTS_DIR}" || :)
@@ -78,7 +81,7 @@ benchmarks-pr-comment:
     KUBERNETES_SERVICE_ACCOUNT_OVERWRITE: dd-trace-py
 
 check-big-regressions:
-  stage: benchmarks-report
+  stage: report
   when: always
   tags: ["arch:amd64"]
   image: $MICROBENCHMARKS_CI_IMAGE
@@ -90,20 +93,3 @@ check-big-regressions:
   variables:
     # Gitlab and BP specific env vars. Do not modify.
     KUBERNETES_SERVICE_ACCOUNT_OVERWRITE: dd-trace-py
-
-benchmark-serverless:
-  stage: benchmarks
-  trigger:
-    project: DataDog/serverless-tools
-    strategy: depend
-  needs: []
-  variables:
-    UPSTREAM_PIPELINE_ID: $CI_PIPELINE_ID
-    UPSTREAM_PROJECT_URL: $CI_PROJECT_URL
-    UPSTREAM_COMMIT_BRANCH: $CI_COMMIT_BRANCH
-    UPSTREAM_COMMIT_AUTHOR: $CI_COMMIT_AUTHOR
-    UPSTREAM_COMMIT_TITLE: $CI_COMMIT_TITLE
-    UPSTREAM_COMMIT_TAG: $CI_COMMIT_TAG
-    UPSTREAM_PROJECT_NAME: $CI_PROJECT_NAME
-    UPSTREAM_GITLAB_USER_LOGIN: $GITLAB_USER_LOGIN
-    UPSTREAM_GITLAB_USER_EMAIL: $GITLAB_USER_EMAIL

Diff for: .gitlab/benchmarks/serverless.yml

@@ -0,0 +1,19 @@
+variables:
+  SLS_CI_IMAGE: registry.ddbuild.io/ci/serverless-tools:1
+
+benchmark-serverless:
+  stage: benchmarks
+  trigger:
+    project: DataDog/serverless-tools
+    strategy: depend
+  needs: []
+  variables:
+    UPSTREAM_PIPELINE_ID: $CI_PIPELINE_ID
+    UPSTREAM_PROJECT_URL: $CI_PROJECT_URL
+    UPSTREAM_COMMIT_BRANCH: $CI_COMMIT_BRANCH
+    UPSTREAM_COMMIT_AUTHOR: $CI_COMMIT_AUTHOR
+    UPSTREAM_COMMIT_TITLE: $CI_COMMIT_TITLE
+    UPSTREAM_COMMIT_TAG: $CI_COMMIT_TAG
+    UPSTREAM_PROJECT_NAME: $CI_PROJECT_NAME
+    UPSTREAM_GITLAB_USER_LOGIN: $GITLAB_USER_LOGIN
+    UPSTREAM_GITLAB_USER_EMAIL: $GITLAB_USER_EMAIL