Commit 63586e9a authored by Fabio Pitino's avatar Fabio Pitino

Merge branch '326791-eliminate-race-condition' into 'master'

Move updating older-statuses-retried before enqueueing

See merge request gitlab-org/gitlab!59034
parents a0313269 61803809
...@@ -31,9 +31,9 @@ module Projects ...@@ -31,9 +31,9 @@ module Projects
# Create status notifying the deployment of pages # Create status notifying the deployment of pages
@status = create_status @status = create_status
@status.update_older_statuses_retried! if Feature.enabled?(:ci_fix_commit_status_retried, project, default_enabled: :yaml)
@status.enqueue! @status.enqueue!
@status.run! @status.run!
@status.update_older_statuses_retried! if Feature.enabled?(:ci_fix_commit_status_retried, project, default_enabled: :yaml)
raise InvalidStateError, 'missing pages artifacts' unless build.artifacts? raise InvalidStateError, 'missing pages artifacts' unless build.artifacts?
raise InvalidStateError, 'build SHA is outdated for this ref' unless latest? raise InvalidStateError, 'build SHA is outdated for this ref' unless latest?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment