From 30d01b0f6192488d483dbf676b05f3a917742f2d Mon Sep 17 00:00:00 2001
From: knj <jan.kiene@iis.fraunhofer.de>
Date: Thu, 22 Sep 2022 16:07:56 +0200
Subject: [PATCH 1/3] allow manual run of evs be test in MR pipelines

---
 .gitlab-ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bdfefff19d..51e0be0493 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -370,7 +370,10 @@ self-test-on-merge-request:
 be-2-evs-linux:
   extends:
     - .test-job-linux
-    - .rules-main-push
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+      when: manual
   tags:
     - be-2-evs-temp
   stage: test
-- 
GitLab


From 9b2e83509d477e3d58dc66ba6ffd449891243609 Mon Sep 17 00:00:00 2001
From: kiene <jan.kiene@iis.fraunhofer.de>
Date: Thu, 22 Sep 2022 14:25:04 +0000
Subject: [PATCH 2/3] test whether a separate stage would fix the blocking

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 51e0be0493..55b41f4d75 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,6 +22,7 @@ stages:
   - maintenance
   - build
   - test
+  - test-optional
   - compare
 
 # ---------------------------------------------------------------
@@ -376,7 +377,7 @@ be-2-evs-linux:
       when: manual
   tags:
     - be-2-evs-temp
-  stage: test
+  stage: test-optional
   needs: [ "build-codec-linux-cmake" ]
   timeout: "20 minutes" # To be revisited
   script:
-- 
GitLab


From 02fa548164aeb205d2ab0fc746a25c392e5ceec4 Mon Sep 17 00:00:00 2001
From: kiene <jan.kiene@iis.fraunhofer.de>
Date: Thu, 22 Sep 2022 14:37:55 +0000
Subject: [PATCH 3/3] remove extra stage and allow failure for manual run

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 55b41f4d75..698c5f0533 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,6 @@ stages:
   - maintenance
   - build
   - test
-  - test-optional
   - compare
 
 # ---------------------------------------------------------------
@@ -375,9 +374,10 @@ be-2-evs-linux:
     - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
       when: manual
+      allow_failure: true
   tags:
     - be-2-evs-temp
-  stage: test-optional
+  stage: test
   needs: [ "build-codec-linux-cmake" ]
   timeout: "20 minutes" # To be revisited
   script:
-- 
GitLab