Skip to content

[8.2](backport #417) validate kubernetes templates in .CI#418

Merged
narph merged 2 commits into8.2from
mergify/bp/8.2/pr-417
May 10, 2022
Merged

[8.2](backport #417) validate kubernetes templates in .CI#418
narph merged 2 commits into8.2from
mergify/bp/8.2/pr-417

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented May 10, 2022

This is an automatic backport of pull request #417 done by Mergify.
Cherry-pick of 23238de has failed:

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

You are currently cherry-picking commit 23238de1a.
  (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:   Makefile
	modified:   deploy/kubernetes/Makefile
	modified:   deploy/kubernetes/elastic-agent-managed-kubernetes.yaml
	modified:   deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   version/docs/version.asciidoc

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* update version

* test valiadtion

* invalid

* invalid

* valid

* move func

* move func

(cherry picked from commit 23238de)

# Conflicts:
#	version/docs/version.asciidoc
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels May 10, 2022
@mergify mergify bot assigned narph May 10, 2022
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented May 10, 2022

💚 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

  • Start Time: 2022-05-10T13:42:56.713+0000

  • Duration: 21 min 44 sec

Test stats 🧪

Test Results
Failed 0
Passed 3841
Skipped 21
Total 3862

🤖 GitHub comments

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

  • /test : Re-trigger the build.

  • /package : Generate the packages.

  • run integration tests : Run the Elastic Agent Integration tests.

  • run end-to-end tests : Generate the packages and run the E2E Tests.

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

@v1v v1v removed the conflicts There is a conflict in the backported pull request label May 10, 2022
@narph narph added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label May 10, 2022
@narph narph merged commit f1d892e into 8.2 May 10, 2022
@narph narph deleted the mergify/bp/8.2/pr-417 branch May 10, 2022 14:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants