Skip to content

Fix not skipped manual and delayed DAG jobs

What does this MR do?

Related to #281878 (closed)

When a job needs a skipped job, it needs to be skipped. This bug was fixed for when: on_success jobs (#31526 (closed)), but not for when: delayed and when: manual. This MR fixes this.

feature flag => skip_dag_manual_and_delayed_jobs #297240 (closed)

Screenshots (strongly suggested)

Example 1

build:
  stage: build
  script: exit 1

test:
  stage: test
  script: exit 0

deploy:
  stage: deploy
  script: exit 0
  when: manual
  needs: [test]

Before:

Screen_Shot_2021-01-04_at_15.21.27

After:

Screen_Shot_2021-01-04_at_15.28.59

Example 2

build:
  stage: build
  script: exit 1

test:
  stage: test
  script: exit 0

deploy:
  stage: deploy
  script: exit 0
  when: delayed
  start_in: 5 seconds
  needs: [test]

Before:

Screen_Shot_2021-01-04_at_15.21.36

After:

Screen_Shot_2021-01-04_at_15.29.05

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • Label as security and @ mention @gitlab-com/gl-security/appsec
  • The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • Security reports checked/validated by a reviewer from the AppSec team
Edited by Furkan Ayhan

Merge request reports