ci: set benchmarking jobs to be interruptible outside master (#6940)

* set benchmarking jobs to be interruptible outside main

* set serverless benchmarking jobs to be interruptible outside main

* change macrobenchmark runner type since they're also run on every branch

* test interruptibility

* test interruptibility

* set workflow:auto_cancel:on_new_commit to interruptible

* test interruptibility

* Update .gitlab/macrobenchmarks.yml

Co-authored-by: Ruben Bridgewater <ruben@bridgewater.de>

---------

Co-authored-by: Ruben Bridgewater <ruben@bridgewater.de>

Author: igoragoli

.gitlab-ci.yml

@@ -27,6 +27,8 @@ include:
   - local: ".gitlab/macrobenchmarks.yml"
 
 workflow:
+  auto_cancel:
+    on_new_commit: interruptible
   rules:
     - if: $CI_COMMIT_TAG =~ /^v?[0-9]+\.[0-9]+\.[0-9]+$/
       variables:

.gitlab/benchmarks.yml

@@ -12,7 +12,10 @@ variables:
   when: on_success
   tags: ["runner:apm-k8s-m7i-metal"]
   image: $MICROBENCHMARKS_CI_IMAGE
-  interruptible: true
+  rules:
+    - if: $CI_COMMIT_BRANCH == 'master'
+      interruptible: false
+    - interruptible: true
   timeout: 15m # TODO: Fix worker queueing and reduce this.
   script:
     - git clone --branch dd-trace-js https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/benchmarking-platform platform && cd platform
@@ -97,6 +100,10 @@ benchmark-serverless:
   image: $SLS_CI_IMAGE
   tags: ["arch:amd64"]
   when: on_success
+  rules:
+    - if: $CI_COMMIT_BRANCH == 'master'
+      interruptible: false
+    - interruptible: true
   needs:
     - benchmark-serverless-trigger
   script:
@@ -106,6 +113,10 @@ benchmark-serverless:
 benchmark-serverless-trigger:
   stage: benchmarks
   needs: []
+  rules:
+    - if: $CI_COMMIT_BRANCH == 'master'
+      interruptible: false
+    - interruptible: true
   trigger:
     project: DataDog/serverless-tools
     strategy: depend

.gitlab/macrobenchmarks.yml

@@ -6,12 +6,13 @@ include:
 
 .macrobenchmarks:
   stage: macrobenchmarks
+  when: always
   rules:
-    - when: always
-    - when: manual
+    - if: $CI_COMMIT_BRANCH == 'master'
+      interruptible: false
+    - interruptible: true
   tags: ["runner:apm-k8s-same-cpu"]
   needs: []
-  interruptible: true
   timeout: 15m # TODO: Fix worker queueing and reduce this.
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/benchmarking-platform:js-hapi
   script: