From 6ebf491b50a45d1814a72a6ac4287f4a15ba39ce Mon Sep 17 00:00:00 2001
From: Alexander Samusev <41779041+alvicsam@users.noreply.github.com>
Date: Thu, 11 Apr 2024 17:29:00 +0200
Subject: [PATCH] [ci] Divide subsystem-regression-tests into 2 jobs (#4076)

Currently `subsystem-regression-tests` job fails if the first benchmarks
fail and there is no result for the second benchmark. Also dividing the
job makes the pipeline faster (currently it's a longest job)

cc https://github.com/paritytech/ci_cd/issues/969
cc @AndreiEres

---------

Co-authored-by: Andrei Eres <eresav@me.com>
---
 .gitlab/pipeline/publish.yml |  8 ++++++--
 .gitlab/pipeline/test.yml    | 21 +++++++++++++++++++--
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/.gitlab/pipeline/publish.yml b/.gitlab/pipeline/publish.yml
index 954df10bef..d8f5d58322 100644
--- a/.gitlab/pipeline/publish.yml
+++ b/.gitlab/pipeline/publish.yml
@@ -70,7 +70,9 @@ publish-subsystem-benchmarks:
     - .kubernetes-env
     - .publish-gh-pages-refs
   needs:
-    - job: subsystem-regression-tests
+    - job: subsystem-benchmark-availability-recovery
+      artifacts: true
+    - job: subsystem-benchmark-availability-distribution
       artifacts: true
     - job: publish-rustdoc
       artifacts: false
@@ -109,7 +111,9 @@ trigger_workflow:
   needs:
     - job: publish-subsystem-benchmarks
       artifacts: false
-    - job: subsystem-regression-tests
+    - job: subsystem-benchmark-availability-recovery
+      artifacts: true
+    - job: subsystem-benchmark-availability-distribution
       artifacts: true
   script:
     - echo "Triggering workflow"
diff --git a/.gitlab/pipeline/test.yml b/.gitlab/pipeline/test.yml
index af16f5d2de..76f3533c29 100644
--- a/.gitlab/pipeline/test.yml
+++ b/.gitlab/pipeline/test.yml
@@ -511,12 +511,12 @@ test-syscalls:
       fi
   allow_failure: false # this rarely triggers in practice
 
-subsystem-regression-tests:
+subsystem-benchmark-availability-recovery:
   stage: test
   artifacts:
     name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
     when: always
-    expire_in: 1 days
+    expire_in: 1 hour
     paths:
       - charts/
   extends:
@@ -525,6 +525,23 @@ subsystem-regression-tests:
     - .run-immediately
   script:
     - cargo bench --profile=testnet -p polkadot-availability-recovery --bench availability-recovery-regression-bench --features subsystem-benchmarks
+  tags:
+    - benchmark
+  allow_failure: true
+
+subsystem-benchmark-availability-distribution:
+  stage: test
+  artifacts:
+    name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
+    when: always
+    expire_in: 1 hour
+    paths:
+      - charts/
+  extends:
+    - .docker-env
+    - .common-refs
+    - .run-immediately
+  script:
     - cargo bench --profile=testnet -p polkadot-availability-distribution --bench availability-distribution-regression-bench --features subsystem-benchmarks
   tags:
     - benchmark