diff --git a/includes/build-jobs.yml b/includes/build-jobs.yml index 0fc5b68c613647b2ce6a05bb4114e3956e4ef2fe..508705e991bb26a81afe0d512131f8da9d4224f1 100644 --- a/includes/build-jobs.yml +++ b/includes/build-jobs.yml @@ -24,8 +24,6 @@ build-codec-linux-make: # ensure that codec builds on linux with cmake build-codec-linux-cmake: rules: - - if: $CI_MERGE_REQUEST_TITLE =~ /^(\[Draft\]|\(Draft\)|Draft:)/ - when: never - if: $MANUAL_PIPELINE_TYPE == 'long-term-logs' || $MANUAL_PIPELINE_TYPE == 'backup-long-term-logs' || $MANUAL_PIPELINE_TYPE == 'ivas-conformance-linux' || $UPDATE_PAGES when: never - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH @@ -48,8 +46,6 @@ build-codec-linux-cmake: # ensure that codec builds on linux with instrumentation active build-codec-linux-instrumented-make: rules: - - if: $CI_MERGE_REQUEST_TITLE =~ /^(\[Draft\]|\(Draft\)|Draft:)/ - when: never - if: $MANUAL_PIPELINE_TYPE == 'long-term-logs' || $MANUAL_PIPELINE_TYPE == 'backup-long-term-logs' || $UPDATE_PAGES when: never - if: $MEASURE_COMPLEXITY_LINUX || $MANUAL_PIPELINE_TYPE == 'complexity' @@ -75,8 +71,6 @@ build-codec-linux-instrumented-make: # make sure that the codec builds with msan, asan and usan build-codec-sanitizers-linux: rules: - - if: $CI_MERGE_REQUEST_TITLE =~ /^(\[Draft\]|\(Draft\)|Draft:)/ - when: never - if: $MANUAL_PIPELINE_TYPE == 'long-term-logs' || $MANUAL_PIPELINE_TYPE == 'backup-long-term-logs' || $UPDATE_PAGES when: never - if: $MANUAL_PIPELINE_TYPE == 'sanitizer' @@ -102,8 +96,6 @@ build-codec-linux-debugging-make: extends: - .build-job-linux rules: - - if: $CI_MERGE_REQUEST_TITLE =~ /^(\[Draft\]|\(Draft\)|Draft:)/ - when: never - if: $MANUAL_PIPELINE_TYPE == 'long-term-logs' || $MANUAL_PIPELINE_TYPE == 'backup-long-term-logs' || $UPDATE_PAGES when: never - if: $MANUAL_PIPELINE_TYPE == 'pytest-compare-enc-dmx' diff --git a/main-basop.yml b/main-basop.yml index 5ce2fa932521b8f8c3f6aeff319fea03f012dea7..97d22019d766b646571209b275998c7de840ef61 100644 --- a/main-basop.yml +++ b/main-basop.yml @@ -202,23 +202,6 @@ workflow: when: never - when: never -.rules-merge-request-no-draft: - rules: - - if: $CI_MERGE_REQUEST_TITLE =~ /^(\[Draft\]|\(Draft\)|Draft:)/ - when: never - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - - if: $CI_PIPELINE_SOURCE == 'push' - when: never - - when: never - -.rules-merge-request-to-main-no-draft: - rules: - - if: $CI_MERGE_REQUEST_TITLE =~ /^(\[Draft\]|\(Draft\)|Draft:)/ - when: never - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" - - if: $CI_PIPELINE_SOURCE == 'push' - when: never - .rules-pytest-to-ref-pre: rules: - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "ivas-conformance-linux" @@ -453,7 +436,7 @@ workflow: .check-be-job: extends: - .test-job-linux - - .rules-merge-request-to-main-no-draft + - .rules-merge-request-to-main - .test-job-linux-compares-to-fixed-target before_script: - !reference [ .test-job-linux, before_script ] @@ -842,20 +825,6 @@ workflow: # verification jobs # --------------------------------------------------------------- -# fail pipeline in the final stage for pipelines on Draft MRs -# this also only runs on Draft MRs, so should always fail -fail-pipeline-if-in-draft: - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TITLE =~ /^(\[Draft\]|\(Draft\)|Draft:)/ - - if: $CI_PIPELINE_SOURCE == 'push' - when: never - stage: postvalidate - tags: - - ivas-linux - script: - - echo "Your MR is still in Draft state, set it to ready to be mergable, then retrigger the pipeline." - - exit 1 - check-for-parallel-branch-in-float-repo: extends: - .rules-merge-request-to-main @@ -897,7 +866,7 @@ branch-is-up-to-date-with-target-pre: branch-is-up-to-date-with-target-post: extends: - .job-linux - - .rules-merge-request-no-draft + - .rules-merge-request stage: postvalidate tags: - ivas-linux @@ -1159,7 +1128,7 @@ renderer-pytest-on-merge-request: extends: - .test-job-linux-needs-testv-dir - .test-job-linux-compares-to-fixed-target - - .rules-merge-request-no-draft + - .rules-merge-request timeout: "90 minutes" tags: - ivas-linux @@ -1224,7 +1193,7 @@ ivas-pytest-on-merge-request: extends: - .test-job-linux-needs-testv-dir - .test-job-linux-compares-to-fixed-target - - .rules-merge-request-no-draft + - .rules-merge-request stage: compare timeout: "50 minutes" parallel: @@ -1301,7 +1270,7 @@ split-rendering-pytest-on-merge-request: extends: - .test-job-linux-needs-testv-dir - .test-job-linux-compares-to-fixed-target - - .rules-merge-request-no-draft + - .rules-merge-request tags: - ivas-linux-fast timeout: "60 minutes" @@ -1392,7 +1361,7 @@ split-rendering-pytest-on-merge-request: .check-first-frame-is-sid: extends: - .test-job-linux-needs-testv-dir - - .rules-merge-request-to-main-no-draft + - .rules-merge-request-to-main stage: test needs: ["build-codec-linux-make"] script: @@ -1409,7 +1378,7 @@ split-rendering-pytest-on-merge-request: .check-bitexactness-hrtf-rom-and-file: extends: - .test-job-linux - - .rules-merge-request-no-draft + - .rules-merge-request stage: test needs: ["build-codec-linux-make"] timeout: "5 minutes" @@ -1437,7 +1406,7 @@ split-rendering-pytest-on-merge-request: .ivas-interop-on-merge-request: extends: - .test-job-linux-needs-testv-dir - - .rules-merge-request-to-main-no-draft + - .rules-merge-request-to-main - .test-job-linux-compares-to-fixed-target stage: test timeout: "20 minutes" @@ -1487,7 +1456,7 @@ split-rendering-pytest-on-merge-request: split-rendering-smoke-test: extends: - .test-job-linux - - .rules-merge-request-no-draft + - .rules-merge-request needs: ["build-codec-linux-make"] stage: test script: @@ -1510,7 +1479,7 @@ split-rendering-smoke-test: lc3-wrapper-unit-test: extends: - .test-job-linux - - .rules-merge-request-no-draft + - .rules-merge-request needs: ["build-codec-linux-cmake"] stage: test script: @@ -1529,7 +1498,7 @@ lc3-wrapper-unit-test: .renderer-smoke-test: extends: - .test-job-linux - - .rules-merge-request-to-main-no-draft + - .rules-merge-request-to-main needs: ["build-codec-linux-make"] stage: test script: @@ -1642,7 +1611,7 @@ lc3-wrapper-unit-test: stage: test needs: ["build-codec-sanitizers-linux"] extends: - - .rules-merge-request-no-draft + - .rules-merge-request - .test-job-linux artifacts: name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"