Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.17](backport #39270) Ensure ordered DRA artifacts #39287

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 30, 2024

Proposed commit message

As things are now we allow parallel builds on the
packaging pipeline, which would result in out of order artifacts (depending on which one takes longer to finish).

This commit leverages a queue to ensure a FIFO queue for DRA artifacts using the design pattern in:
https://buildkite.com/blog/concurrency-gates

Related issues

Testing/Screenshots

Using the latest approach, I triggered two DRA main snapshot builds in succession using the env vars:

DRA_BRANCH="main"
RUN_SNAPSHOT="true"
DRY_RUN="true"

and was able to see the first one triggered proceed:

image
image

whereas the second one was paused (as desired) waiting for the snapshot concurrency group:

image

It would have been nice to trigger a staging build at the same time (which should allow one job at a time, since it's a different concurrency gate) but it's not easy given the conditionals.


This is an automatic backport of pull request #39270 done by [Mergify](https://mergify.com).

As things are now we allow parallel builds on the
packaging pipeline, which could result in out of order
artifacts (depending on which one takes longer to finish).

This commit implements two "queues" (snapshot/staging)
to ensure ordered builds of DRA artifacts.

Relates https://github.com/elastic/ingest-dev/issues/3095

(cherry picked from commit d275f27)

# Conflicts:
#	.buildkite/packaging.pipeline.yml
@mergify mergify bot requested a review from a team as a code owner April 30, 2024 08:37
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Apr 30, 2024
Copy link
Contributor Author

mergify bot commented Apr 30, 2024

Cherry-pick of d275f27 has failed:

On branch mergify/bp/7.17/pr-39270
Your branch is up to date with 'origin/7.17'.

You are currently cherry-picking commit d275f2768c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .buildkite/packaging.pipeline.yml

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Apr 30, 2024
@botelastic
Copy link

botelastic bot commented Apr 30, 2024

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Duration: 13 min 57 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@dliappis
Copy link
Contributor

dliappis commented May 1, 2024

Closing because it's already included in #39197 (#39270 has been cherry picked into it)

@dliappis dliappis closed this May 1, 2024
@mergify mergify bot deleted the mergify/bp/7.17/pr-39270 branch May 1, 2024 08:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants