Module: Mesa Branch: main Commit: 22d9c17c66109c9e46e996816a274a290a57b7e3 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=22d9c17c66109c9e46e996816a274a290a57b7e3
Author: Eric Engestrom <e...@igalia.com> Date: Fri Dec 1 09:51:24 2023 +0000 ci: clean up pre-merge and fork pipelines rules We've already handled all the Marge-bot possibilities above, so drop the redundant `marge-bot` check, which also makes it obvious the last line was dead code. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26451> --- .gitlab-ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 18346e6dcf3..a1934158af2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,18 +50,17 @@ workflow: KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${KERNEL_TAG} JOB_PRIORITY: 40 VALVE_INFRA_VANGOGH_JOB_PRIORITY: priority:low - # any other pipeline - - if: $GITLAB_USER_LOGIN != "marge-bot" && $FORCE_KERNEL_TAG != null + # pre-merge or fork pipeline + - if: $FORCE_KERNEL_TAG != null variables: KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${FORCE_KERNEL_TAG} JOB_PRIORITY: 50 VALVE_INFRA_VANGOGH_JOB_PRIORITY: priority:low - - if: $GITLAB_USER_LOGIN != "marge-bot" && $FORCE_KERNEL_TAG == null + - if: $FORCE_KERNEL_TAG == null variables: KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${KERNEL_TAG} JOB_PRIORITY: 50 VALVE_INFRA_VANGOGH_JOB_PRIORITY: priority:low - - when: always variables:
