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

[8.13](backport #39295) Deploy/K8S pipeline post-migration fixes #39489

Merged
merged 1 commit into from
May 10, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 9, 2024

Proposed commit message

In scope of https://github.com/elastic/ingest-dev/issues/3254 - updated deploy/kubernetes pipeline to match same steps & commands as in Jenkins.
Jenkins vs. Buildkite comparison: https://gist.github.com/oakrizan/2e14c620238034d1e6e4f16b9f0fbdb6
BK builds: https://buildkite.com/elastic/deploy-k8s/builds?branch=elastic%3Amergify%2Fbp%2F8.13%2Fpr-39295

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.

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs


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

@mergify mergify bot requested a review from a team as a code owner May 9, 2024 13:29
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels May 9, 2024
Copy link
Contributor Author

mergify bot commented May 9, 2024

Cherry-pick of 8664cae has failed:

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

You are currently cherry-picking commit 8664cae202.
  (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:
	deleted:    .buildkite/deploy/kubernetes/scripts/install-kind.sh
	deleted:    .buildkite/deploy/kubernetes/scripts/install-kubectl.sh
	deleted:    .buildkite/deploy/kubernetes/scripts/make.sh
	modified:   .buildkite/deploy/kubernetes/scripts/setup-k8s-env.sh
	modified:   .buildkite/env-scripts/env.sh
	modified:   .buildkite/env-scripts/util.sh
	modified:   .buildkite/hooks/pre-command
	modified:   .buildkite/hooks/scripts/util.sh
	modified:   .buildkite/scripts/setenv.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .buildkite/deploy/kubernetes/deploy-k8s-pipeline.yml


It took 2.10 seconds to enumerate untracked files. 'status -uno'
may speed it up, but you have to be careful not to forget to add
new files yourself (see 'git help status').

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 May 9, 2024
Copy link
Contributor Author

mergify bot commented May 9, 2024

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.13/pr-39295 upstream/mergify/bp/8.13/pr-39295
git merge upstream/8.13
git push upstream mergify/bp/8.13/pr-39295

@oakrizan oakrizan added kubernetes Enable builds in the CI for kubernetes Team:Ingest-EngProd labels May 9, 2024
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label May 9, 2024
@oakrizan oakrizan removed the conflicts There is a conflict in the backported pull request label May 9, 2024
* removed make.sh, updated check step

* updated steps with env setup & removed setup from hook

* updated setenv.sh

* moved module to env

* updated PR based on comments

* updated common.sh

* updated k8s env setup

* removed tmp folder

* added section for tests in BK

(cherry picked from commit 8664cae)
Copy link
Contributor

@dliappis dliappis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@oakrizan oakrizan merged commit 74c52c2 into 8.13 May 10, 2024
117 of 118 checks passed
@oakrizan oakrizan deleted the mergify/bp/8.13/pr-39295 branch May 10, 2024 07:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport kubernetes Enable builds in the CI for kubernetes Team:Ingest-EngProd
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants