From e101290af81354fb8e1f615519b57d857d07f9fb Mon Sep 17 00:00:00 2001
From: Jan Kiene <jan.kiene@iis.fraunhofer.de>
Date: Thu, 11 Dec 2025 11:00:49 +0100
Subject: [PATCH 1/2] remove obsolete rules-basis

---
 main-basop.yml | 56 --------------------------------------------------
 main-float.yml | 28 -------------------------
 2 files changed, 84 deletions(-)

diff --git a/main-basop.yml b/main-basop.yml
index 1200deb..6d00f20 100644
--- a/main-basop.yml
+++ b/main-basop.yml
@@ -194,61 +194,6 @@ workflow:
 # Rules templates
 # ---------------------------------------------------------------
 
-.rules-basis:
-  rules:
-    # see https://docs.gitlab.com/ee/ci/yaml/workflow.html#switch-between-branch-pipelines-and-merge-request-pipelines
-    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push"
-      when: never
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
-      variables:
-        IVAS_PIPELINE_NAME: 'MR pipeline: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME'
-    ### disabled for now because pipeline cd is redundant with MR pipeline with current workflow
-    # - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Pushes to main
-    #   variables:
-    #     IVAS_PIPELINE_NAME: 'Push pipeline: $CI_COMMIT_BRANCH'
-    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'default' # for testing
-      variables:
-        IVAS_PIPELINE_NAME: 'Web run pipeline: $CI_COMMIT_BRANCH'
-    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-compare'
-      variables:
-        IVAS_PIPELINE_NAME: 'Run comparison tools against float ref: $CI_COMMIT_BRANCH'
-    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-compare-enc-dmx'
-      variables:
-        IVAS_PIPELINE_NAME: 'Run encoder dmx comparison against float ref: $CI_COMMIT_BRANCH'
-    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-compare-long'
-      variables:
-        IVAS_PIPELINE_NAME: 'Run comparison tools against float ref (long test vectors): $CI_COMMIT_BRANCH'
-    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-compare-to-input'
-      variables:
-        IVAS_PIPELINE_NAME: 'Run comparison tools against input (pass-through only): $CI_COMMIT_BRANCH'
-    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-saturation-smoke-test'
-      variables:
-        IVAS_PIPELINE_NAME: 'Run saturation smoke-test: $CI_COMMIT_BRANCH'
-    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'evs-26444'
-      variables:
-        IVAS_PIPELINE_NAME: 'EVS 26.444 test: $CI_COMMIT_BRANCH'
-    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'sanitizer'
-      variables:
-        IVAS_PIPELINE_NAME: 'Short testvectors sanitizers'
-    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-renderer'
-      variables:
-        IVAS_PIPELINE_NAME: 'Renderer test: $CI_COMMIT_BRANCH'
-    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'complexity'
-      variables:
-        IVAS_PIPELINE_NAME: 'Complexity Measurement on $CI_COMMIT_BRANCH'
-    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'voip-be-test'
-      variables:
-        IVAS_PIPELINE_NAME: 'Voip BE test on $CI_COMMIT_BRANCH'
-    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'peaq-enc-passthrough'
-      variables:
-        IVAS_PIPELINE_NAME: 'PEAQ encoder pass-through test: $CI_COMMIT_BRANCH'
-    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'ivas-conformance'
-      variables:
-        IVAS_PIPELINE_NAME: 'IVAS conformance: $CI_COMMIT_BRANCH'
-    - if: $CI_PIPELINE_SOURCE == 'schedule' # Scheduled in any branch
-      variables:
-        IVAS_PIPELINE_NAME: 'Scheduled pipeline: $CI_COMMIT_BRANCH'
-
 .rules-merge-request:
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
@@ -257,7 +202,6 @@ workflow:
     - when: never
 
 .rules-merge-request-no-draft:
-  extends: .rules-basis
   rules:
     - if: $CI_MERGE_REQUEST_TITLE =~ /^(\[Draft\]|\(Draft\)|Draft:)/
       when: never
diff --git a/main-float.yml b/main-float.yml
index c044823..1a9791f 100644
--- a/main-float.yml
+++ b/main-float.yml
@@ -100,45 +100,17 @@ workflow:
 # Rules templates
 # ---------------------------------------------------------------
 
-.rules-basis:
-  rules:
-    - if: $MIRROR_ACCESS_TOKEN # Don't run in the mirror update pipeline (only then MIRROR_ACCESS_TOKEN is defined)
-      when: never
-    - if: $CI_PIPELINE_SOURCE == 'schedule' # Don't run in any scheduled pipelines by default (use schedule templates below to enable again for certain conditions)
-      when: never
-    - if: $CI_PIPELINE_SOURCE == 'trigger' # Don't run triggered pipeline by default
-      when: never
-    - if: $MANUAL_PIPELINE_TYPE == 'test-be-release' # Skip all the normal jobs when testing manually against release codec
-      when: never
-    - if: $MANUAL_PIPELINE_TYPE == 'test-long-self-test' # Skip all the normal jobs when testing manually against release codec
-      when: never
-    - if: $MANUAL_PIPELINE_TYPE == 'ivas-conformance'
-      when: never
-    - if: $MANUAL_PIPELINE_TYPE == 'ivas-conformance-linux'
-      when: never
-    - if: $MANUAL_PIPELINE_TYPE == 'check-clipping'
-      when: never
-    - if: $MANUAL_PIPELINE_TYPE == 'test-branch-vs-input-passthrough'
-      when: never
-    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'complexity'
-      variables:
-        IVAS_PIPELINE_NAME: 'Complexity Measurement on $CI_COMMIT_BRANCH'
-    - when: on_success
-
 .rules-merge-request-to-main:
-  extends: .rules-basis
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main"
     - if: $CI_PIPELINE_SOURCE == 'push'
       when: never
 
 .rules-main-push:
-  extends: .rules-basis
   rules:
     - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
 
 .rules-main-scheduled:
-  extends: .rules-basis
   rules:
     - if: $CI_PIPELINE_SOURCE == 'schedule' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
 
-- 
GitLab


From 8debe276319b3314a21057711706e137a62bbe36 Mon Sep 17 00:00:00 2001
From: Jan Kiene <jan.kiene@iis.fraunhofer.de>
Date: Thu, 11 Dec 2025 11:30:45 +0100
Subject: [PATCH 2/2] move common rules into shared include

---
 includes/rules.yml |  5 +++++
 main-basop.yml     |  7 +------
 main-float.yml     | 13 +------------
 3 files changed, 7 insertions(+), 18 deletions(-)
 create mode 100644 includes/rules.yml

diff --git a/includes/rules.yml b/includes/rules.yml
new file mode 100644
index 0000000..3320ca7
--- /dev/null
+++ b/includes/rules.yml
@@ -0,0 +1,5 @@
+.rules-merge-request-to-main:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main"
+    - if: $CI_PIPELINE_SOURCE == 'push'
+      when: never
diff --git a/main-basop.yml b/main-basop.yml
index 6d00f20..5ce2fa9 100644
--- a/main-basop.yml
+++ b/main-basop.yml
@@ -5,6 +5,7 @@ include:
   - local: includes/complexity-jobs.yml
   - local: includes/smoke-test.yml
   - local: includes/build-jobs.yml
+  - local: includes/rules.yml
 
 default:
   # by default, we want all jobs to be interruptible, and we need to configure this explicitly
@@ -210,12 +211,6 @@ workflow:
       when: never
     - when: never
 
-.rules-merge-request-to-main:
-  rules:
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main"
-    - if: $CI_PIPELINE_SOURCE == 'push'
-      when: never
-
 .rules-merge-request-to-main-no-draft:
   rules:
     - if: $CI_MERGE_REQUEST_TITLE =~ /^(\[Draft\]|\(Draft\)|Draft:)/
diff --git a/main-float.yml b/main-float.yml
index 1a9791f..4dcc5f6 100644
--- a/main-float.yml
+++ b/main-float.yml
@@ -5,6 +5,7 @@ include:
   - local: includes/complexity-jobs.yml
   - local: includes/smoke-test.yml
   - local: includes/build-jobs.yml
+  - local: includes/rules.yml
 
 default:
   # by default, we want all jobs to be interruptible, and we need to configure this explicitly
@@ -100,20 +101,10 @@ workflow:
 # Rules templates
 # ---------------------------------------------------------------
 
-.rules-merge-request-to-main:
-  rules:
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main"
-    - if: $CI_PIPELINE_SOURCE == 'push'
-      when: never
-
 .rules-main-push:
   rules:
     - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
 
-.rules-main-scheduled:
-  rules:
-    - if: $CI_PIPELINE_SOURCE == 'schedule' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-
 # ---------------------------------------------------------------
 # Generic script anchors
 # ---------------------------------------------------------------
@@ -2166,7 +2157,6 @@ sanitizer-test-osba-planar-hoa3-ism4:
 .coverage-test-template:
   extends:
     - .test-job-linux-needs-testv-dir
-    - .rules-main-scheduled
   tags:
     - ivas-linux-fast
   stage: test
@@ -2198,7 +2188,6 @@ sanitizer-test-osba-planar-hoa3-ism4:
 
 coverage-merge:
   extends:
-    - .rules-main-scheduled
     - .test-job-linux-needs-testv-dir
   tags:
     - ivas-linux-fast
-- 
GitLab