Commit f4a8c7ba authored by Fabian Müller's avatar Fabian Müller
Browse files

Port latest changes to rules

parent ac0ad370

includes/job-templates.yml

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
  stage: test

  extends:

    - .test-job-linux-needs-testv-dir

    - .rules-merge-request

    - .rules-merge-request-to-main

  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"

    expire_in: 1 week

includes/rules.yml

+16 −2
Original line number Diff line number Diff line
@@ -21,10 +21,24 @@ 
      when: never

    - when: on_success



.rules-merge-request:

.rules-merge-request-to-main:

  extends: .rules-basis

  rules:

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" # only have MR pipelines for MRs to main

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main"

    - if: $CI_PIPELINE_SOURCE == 'push'

      when: never



.rules-merge-request-to-basop-ci-branch:

  extends: .rules-basis

  rules:

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "basop-ci-branch"

    - if: $CI_PIPELINE_SOURCE == 'push'

      when: never



.rules-merge-request-to-basop-ci-branch-or-main:

  extends: .rules-basis

  rules:

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "basop-ci-branch" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main")

    - if: $CI_PIPELINE_SOURCE == 'push'

      when: never