diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 26154018e6..bf7d666f92 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -553,8 +553,8 @@ Ubuntu_GCC_integration_tests_asan: rules: - if: $CI_PROJECT_ID != "7107382" when: never - - if: $CI_PIPELINE_SOURCE == "merge_request_event" - when: manual + # Merge request event rule is architecture-specific + # Unlike ARM64, AMD64 job is manual non-blocking as it's seldom useful - if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "schedule" image: macos-15-xcode-16 tags: @@ -593,6 +593,11 @@ Ubuntu_GCC_integration_tests_asan: macOS15_Xcode16_amd64: extends: .MacOS + rules: + - !reference [.MacOS, rules] + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + when: manual + allow_failure: true cache: key: prefix: macOS15_Xcode16_amd64.v3 @@ -610,6 +615,9 @@ macOS15_Xcode16_amd64: macOS15_Xcode16_arm64: extends: .MacOS + rules: + - !reference [.MacOS, rules] + - if: $CI_PIPELINE_SOURCE == "merge_request_event" cache: key: prefix: macOS15_Xcode16_arm64.v3