Skip to content

[9.1] (backport #8889) Revert [CI] Stable stack version override #8352 and #8528 #8907

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

Open
wants to merge 5 commits into
base: 9.1
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 9, 2025

What does this PR do?

Revert #8352 and #8528

Why is it important?

Team wanted to have a fully automated process for auto-merge if PRs with the bumps passed the CI.

Checklist

  • I have read and understood the pull request guidelines of this project.
  • 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/fragments using the changelog tool
  • I have added an integration test or an E2E test

Disruptive User Impact

How to test this PR locally

Related issues

Questions to ask yourself

  • How are we going to support this in production?
  • How are we going to measure its adoption?
  • How are we going to debug this?
  • What are the metrics I should take care of?
  • ...

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

(cherry picked from commit fb8b883)

# Conflicts:
#	pkg/testing/ess/create_deployment_csp_configuration.yaml
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jul 9, 2025
@mergify mergify bot requested review from a team as code owners July 9, 2025 10:52
@mergify mergify bot assigned v1v Jul 9, 2025
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jul 9, 2025
@mergify mergify bot requested review from kaanyalti and removed request for a team July 9, 2025 10:52
@mergify mergify bot added the backport label Jul 9, 2025
@mergify mergify bot requested a review from michel-laterman July 9, 2025 10:52
Copy link
Contributor Author

mergify bot commented Jul 9, 2025

Cherry-pick of fb8b883 has failed:

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

You are currently cherry-picking commit fb8b88381.
  (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:    .ci/updatecli/updatecli-bump-stack-version.yml
	deleted:    .github/workflows/bump-stable-snapshot.yml
	modified:   .mergify.yml
	modified:   test_infra/ess/deployment.tf
	deleted:    test_infra/ess/readme.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/testing/ess/create_deployment_csp_configuration.yaml

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

@v1v v1v removed the conflicts There is a conflict in the backported pull request label Jul 9, 2025
@v1v v1v requested a review from pkoutsovasilis July 9, 2025 10:58
@swiatekm
Copy link
Contributor

swiatekm commented Jul 9, 2025

Looks like the e2e test errors are the same as in #8815. We'll need to figure out why these are happening on this stack version - it looks like there's some kind of regression involving ingest pipelines at first glance.

@pkoutsovasilis
Copy link
Contributor

Looks like the e2e test errors are the same as in #8815. We'll need to figure out why these are happening on this stack version - it looks like there's some kind of regression involving ingest pipelines at first glance.

@swiatekm I was just looking at this, could you please create an issue about it and let's discuss it tomorrow in our meeting 🙂

Copy link
Contributor Author

mergify bot commented Jul 14, 2025

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

@v1v v1v enabled auto-merge (squash) July 14, 2025 06:45
Copy link

@elasticmachine
Copy link
Collaborator

elasticmachine commented Jul 14, 2025

Copy link
Contributor Author

mergify bot commented Jul 14, 2025

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/9.1/pr-8889 upstream/mergify/bp/9.1/pr-8889
git merge upstream/9.1
git push upstream mergify/bp/9.1/pr-8889

@swiatekm
Copy link
Contributor

Looks like the e2e test errors are the same as in #8815. We'll need to figure out why these are happening on this stack version - it looks like there's some kind of regression involving ingest pipelines at first glance.

@swiatekm I was just looking at this, could you please create an issue about it and let's discuss it tomorrow in our meeting 🙂

FYI, I've fixed this in 8630213. It was a problem with the test that happened to be triggered by Kibana enabling spaces by default. I'll port that change to other branches, but here it should be enough to rebase on 9.1.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants