diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1c6c3474a073be33d65a7f2c70866213b8142417..911f20ae55b9356ae2064d1ccf944164a4ac05ba 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 diff --git a/tests/conformance-test/test_26252.py b/tests/conformance-test/test_26252.py index d8796b5ae7255810d6f79a25d8cdbb892d0f75c7..ac5ca6d79935b34849b0965d052e11d61c89c03d 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)