From f5af5b480052e5af8d106b31a56d080a14178f84 Mon Sep 17 00:00:00 2001
From: knj <jan.kiene@iis.fraunhofer.de>
Date: Thu, 21 Dec 2023 12:31:44 +0100
Subject: [PATCH 1/2] add workflow and rules for the existing jobs

---
 .gitlab-ci.yml | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4bc603618..dc35eacb8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,6 +17,23 @@ variables:
 default:
   interruptible: true # Make all jobs by default interruptible
 
+workflow:
+  # 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'
+  - 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-mld'
+    variables:
+      IVAS_PIPELINE_NAME: 'Run MLD tool against float ref: $CI_COMMIT_BRANCH'
+
 stages:
   - build
   - test
@@ -69,6 +86,14 @@ stages:
 .remove-unsupported-testcases: &remove-unsupported-testcases
   - sed -i '1629,1635d' scripts/config/self_test.prm
 
+.rules-pytest-mld:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "pytest-mld"
+    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" # only have MR pipelines for MRs to main
+    - if: $CI_PIPELINE_SOURCE == 'push'
+      when: never
+
 # ---------------------------------------------------------------
 # Job templates
 # ---------------------------------------------------------------
@@ -98,6 +123,12 @@ stages:
 
 # ensure that codec builds on linux
 build-codec-linux-make:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'web'
+    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" # only have MR pipelines for MRs to main
+    - if: $CI_PIPELINE_SOURCE == 'push'
+      when: never
   extends:
     - .build-job-linux
   script:
@@ -111,6 +142,7 @@ build-codec-linux-make:
 ivas-pytest-mld-enc-dec:
   extends:
     - .test-job-linux
+    - .rules-pytest-mld
   stage: test
   needs: ["build-codec-linux-make"]
   timeout: "30 minutes"
@@ -151,6 +183,7 @@ ivas-pytest-mld-enc-dec:
 ivas-pytest-mld-dec:
   extends:
     - .test-job-linux
+    - .rules-pytest-mld
   stage: test
   needs: ["build-codec-linux-make"]
   timeout: "30 minutes"
-- 
GitLab


From 61bea4e2db4665f46aff7ff6fa6c8d4cebef5823 Mon Sep 17 00:00:00 2001
From: kiene <jan.kiene@iis.fraunhofer.de>
Date: Thu, 21 Dec 2023 11:37:53 +0000
Subject: [PATCH 2/2] add missing parts in workflow section

---
 .gitlab-ci.yml | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dc35eacb8..cc1cf7750 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,21 +18,23 @@ default:
   interruptible: true # Make all jobs by default interruptible
 
 workflow:
-  # 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'
-  - 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-mld'
-    variables:
-      IVAS_PIPELINE_NAME: 'Run MLD tool against float ref: $CI_COMMIT_BRANCH'
+  name: '$IVAS_PIPELINE_NAME'
+  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'
+    - 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-mld'
+      variables:
+        IVAS_PIPELINE_NAME: 'Run MLD tool against float ref: $CI_COMMIT_BRANCH'
 
 stages:
   - build
-- 
GitLab