From 20e7299b27635e3b3f7a8e55f2274a5f2f672450 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=BCller?= <fabian.mueller@iis.fraunhofer.de>
Date: Tue, 29 Apr 2025 16:44:20 +0200
Subject: [PATCH 1/2] Restore old base rules from BASOP branch

Should re-introduce the expected behavior for BASOP builds.
---
 .gitlab-ci.yml             |  1 +
 .gitlab-ci/rules-basis.yml | 53 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 .gitlab-ci/rules-basis.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bb2259810..e03f48d00 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,6 +5,7 @@ variables:
 
 include:
   - local: .gitlab-ci/variables.yml
+  - local: .gitlab-ci/rules-basis.yml
   - project: ivas-codec-pc/ivas-codec-ci
     ref: *IVAS_CODEC_CI_REF
     file: main.yml
diff --git a/.gitlab-ci/rules-basis.yml b/.gitlab-ci/rules-basis.yml
new file mode 100644
index 000000000..c650f574a
--- /dev/null
+++ b/.gitlab-ci/rules-basis.yml
@@ -0,0 +1,53 @@
+# overwrites the default rules in the IVAS CI repository
+# should be refactored and unified
+.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 == 'schedule' # Scheduled in any branch
+      variables:
+        IVAS_PIPELINE_NAME: 'Scheduled pipeline: $CI_COMMIT_BRANCH'
-- 
GitLab


From 8a5d21c9855023b9da4dfa0d80e1d4e12cfc002a Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 29 Apr 2025 19:39:31 +0200
Subject: [PATCH 2/2] Fix for ivas-pytest-compare-to-input-anchor

---
 .gitlab-ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e03f48d00..b93061941 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -639,8 +639,6 @@ workflow:
         - report-junit.xml
 
 .ivas-pytest-compare-to-input-anchor: &ivas-pytest-compare-to-input-anchor
-  extends:
-    - .job-linux
   stage: test
   needs: ["build-codec-linux-make"]
   timeout: "360 minutes"
-- 
GitLab