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.

Sign up for GitHub

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

Jump to bottom

[7.17](backport #39661) Migrate needed .ci/* scripts into .buildkite/* ( elastic#3353 ) #39748

Merged
merged 1 commit into from
Jun 11, 2024
Merged

[7.17](backport #39661) Migrate needed .ci/* scripts into .buildkite/* ( elastic#3353 ) #39748

merged 1 commit into from
Jun 11, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 28, 2024 •
edited by zube bot
Loading

Proposed commit message

Migrate needed .ci/* scripts into .buildkite/* and change path for them.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Disruptive User Impact

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Logs

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

@ev1yehor @mergify
Migrate needed .ci/* scripts into .buildkite/* ( elastic#3353 ) (#39661)
f4f3989 
* Migrate files and change path to them

* Delete files that was migrated to new path

(cherry picked from commit f411b06)

# Conflicts:
#	.buildkite/deploy/docker/docker-compose.yml
@mergify mergify bot requested a review from a team as a code owner May 28, 2024 11:09
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels May 28, 2024
@mergify mergify bot requested a review from a team as a code owner May 28, 2024 11:09
@mergify mergify bot removed the request for review from a team May 28, 2024 11:09
@mergify Mergify
Copy link
Contributor Author

mergify bot commented May 28, 2024

Cherry-pick of f411b06 has failed:

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

You are currently cherry-picking commit f411b0624c.
  (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)

Changes to be committed:
	modified:   .buildkite/scripts/common.sh
	modified:   .buildkite/scripts/setup_cloud_env.sh
	renamed:    .ci/scripts/terraform-cleanup.sh -> .buildkite/scripts/terraform-cleanup.sh

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

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

@mergify mergify bot requested review from AndersonQ and faec May 28, 2024 11:09
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 28, 2024
@ev1yehor
Copy link
Contributor

/test

@mergify Mergify
Copy link
Contributor Author

mergify bot commented Jun 3, 2024

This pull request has not been merged yet. Could you please review and merge it @ev1yehor? 🙏

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 5, 2024
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Jun 10, 2024

This pull request has not been merged yet. Could you please review and merge it @ev1yehor? 🙏

@ev1yehor ev1yehor removed the conflicts There is a conflict in the backported pull request label Jun 11, 2024
@ev1yehor ev1yehor merged commit 1b59d07 into 7.17 Jun 11, 2024
96 of 97 checks passed
@ev1yehor ev1yehor deleted the mergify/bp/7.17/pr-39661 branch June 11, 2024 11:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pazone pazone pazone approved these changes

@AndersonQ AndersonQ Awaiting requested review from AndersonQ AndersonQ is a code owner automatically assigned from elastic/elastic-agent-data-plane

@faec faec Awaiting requested review from faec faec is a code owner automatically assigned from elastic/elastic-agent-data-plane

Assignees

@ev1yehor ev1yehor

Labels
backport Team:Ingest-EngProd
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ev1yehor @pazone