From 06e0f5becb06f8254f2c3733a43543d4bb6369bd Mon Sep 17 00:00:00 2001
From: norvell <erik.norvell@ericsson.com>
Date: Fri, 26 Apr 2024 05:10:40 +0000
Subject: [PATCH 1/2] Remove folder cleanup from test_26252.py

---
 tests/conformance-test/test_26252.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/conformance-test/test_26252.py b/tests/conformance-test/test_26252.py
index d8796b5ae7..ac5ca6d799 100644
--- a/tests/conformance-test/test_26252.py
+++ b/tests/conformance-test/test_26252.py
@@ -102,9 +102,6 @@ for s in scripts:
         for proc in preproc:
             proc = replace_paths(proc, testv_path, ref_path, cut_path)
             path_arg = proc.split()[-1]
-            if "rm" in proc:
-                if os.path.exists(path_arg):
-                    shutil.rmtree(path_arg, onerror=remove_readonly) # Needed for folder tree removal on Windows.
             if "mkdir" in proc:
                 Path(path_arg).mkdir(parents=True, exist_ok=True)
 
-- 
GitLab


From a05126e305175a696d538cf5375d79b5f2e5ea52 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 30 Apr 2024 09:53:29 +0200
Subject: [PATCH 2/2] Re-enable ivas-conformance in push to main pipeline

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1c6c3474a0..911f20ae55 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1351,7 +1351,7 @@ ivas-conformance:
   timeout: "60 minutes"
   rules:
     - if: ($CI_PIPELINE_SOURCE == 'web' || $CI_PIPELINE_SOURCE == 'trigger') && $MANUAL_PIPELINE_TYPE == 'ivas-conformance'
-#    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
   allow_failure:
     exit_codes:
       - 123
-- 
GitLab