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.9](backport #3169) Skip versions newer than version under test for upgrade tests #3172

Merged
merged 1 commit into from
Aug 4, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 3, 2023

This is an automatic backport of pull request #3169 done by Mergify.
Cherry-pick of 3de585e has failed:

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

You are currently cherry-picking commit 3de585e784.
  (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 <file>..." to mark resolution)
	both modified:   testing/integration/upgrade_test.go

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/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

@mergify mergify bot requested a review from a team as a code owner August 3, 2023 06:25
@mergify mergify bot requested review from AndersonQ and blakerouse and removed request for a team August 3, 2023 06:25
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Aug 3, 2023
@mergify mergify bot assigned pchila Aug 3, 2023
@elasticmachine
Copy link
Contributor

elasticmachine commented Aug 3, 2023

💚 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: 2023-08-04T08:02:33.278+0000

  • Duration: 24 min 22 sec

Test stats 🧪

Test Results
Failed 0
Passed 6007
Skipped 23
Total 6030

💚 Flaky test report

Tests succeeded.

🤖 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.

  • 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!)

@pchila
Copy link
Member

pchila commented Aug 4, 2023

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Aug 4, 2023

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/1)
Auto-merging testing/integration/upgrade_test.go
CONFLICT (content): Merge conflict in testing/integration/upgrade_test.go
error: could not apply 949b833b0... Skip versions newer than version under test for upgrade tests (#3169)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 949b833b0... Skip versions newer than version under test for upgrade tests (#3169)

err-code: A3FC1

@mergify
Copy link
Contributor Author

mergify bot commented Aug 4, 2023

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.9/pr-3169 upstream/mergify/bp/8.9/pr-3169
git merge upstream/8.9
git push upstream mergify/bp/8.9/pr-3169

This PR filters out versions that too new from agent upgrade integration
tests, allowing backport of those test on release branches.

This PR needs to backported together with #2955 onto 8.9 branch

We want to have working upgrade tests with relevant versions also on
release branches
@pchila pchila force-pushed the mergify/bp/8.9/pr-3169 branch from 949b833 to 616f948 Compare August 4, 2023 08:02
@elasticmachine
Copy link
Contributor

🌐 Coverage report

Name Metrics % (covered/total) Diff
Packages 98.684% (75/76) 👍
Files 67.045% (177/264) 👍
Classes 66.263% (328/495) 👍
Methods 53.173% (1014/1907) 👎 -0.028
Lines 39.06% (11558/29590) 👎 -0.096
Conditionals 100.0% (0/0) 💚

@pchila
Copy link
Member

pchila commented Aug 4, 2023

buildkite test this

@pchila pchila merged commit 3baf27f into 8.9 Aug 4, 2023
@pchila pchila deleted the mergify/bp/8.9/pr-3169 branch August 4, 2023 12:56
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants