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.10](backport #3477) Refactor and fix all upgrade integration tests #3495

Merged
merged 5 commits into from
Oct 5, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 2, 2023

This is an automatic backport of pull request #3477 done by Mergify.
Cherry-pick of 6201e19 has failed:

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

You are currently cherry-picking commit 6201e19a5b.
  (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:   magefile.go
	modified:   pkg/testing/fetcher_artifact.go
	modified:   pkg/testing/fixture.go
	modified:   pkg/testing/fixture_install.go
	modified:   pkg/testing/tools/agents.go
	new file:   testing/integration/upgrade_broken_package_test.go
	new file:   testing/integration/upgrade_downgrade_test.go
	new file:   testing/integration/upgrade_fleet_test.go
	new file:   testing/integration/upgrade_gpg_test.go
	new file:   testing/integration/upgrade_rollback_test.go
	new file:   testing/integration/upgrade_standalone_inprogress.go
	new file:   testing/integration/upgrade_standalone_retry_test.go
	new file:   testing/integration/upgrade_standalone_test.go
	new file:   testing/integration/upgrade_uninstall_test.go
	new file:   testing/upgradetest/logger.go
	new file:   testing/upgradetest/upgrader.go
	new file:   testing/upgradetest/versions.go
	new file:   testing/upgradetest/watcher.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   sonar-project.properties
	deleted by them: testing/integration/upgrade_test.go

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

* Fix all upgrade tests.

* Fix imports and headers.

* Update notice.

* Exclude testing/** from sonar.

* Fix comments from code review.

* Add extra error information in the artifact fetcher.

* Fixes from code review.

* Add upgrade uninstall kill watcher test.

* Remove go replace. Regenerate notice. Fix lint.

* Import WithSourceURI logic. Fix fleet test to not skip if the versions are different and the commits are the same.

* More test fixes.

* Fix imports.

* Re-add TestStandaloneUpgradeFailsWhenUpgradeIsInProgress. Fix code review.

(cherry picked from commit 6201e19)

# Conflicts:
#	sonar-project.properties
#	testing/integration/upgrade_test.go
@mergify mergify bot requested a review from a team as a code owner October 2, 2023 16:08
@mergify mergify bot requested review from michalpristas and blakerouse and removed request for a team October 2, 2023 16:08
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 2, 2023
@elasticmachine
Copy link
Contributor

elasticmachine commented Oct 2, 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-10-05T15:04:05.645+0000

  • Duration: 28 min 7 sec

Test stats 🧪

Test Results
Failed 0
Passed 6277
Skipped 55
Total 6332

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

@mergify
Copy link
Contributor Author

mergify bot commented Oct 2, 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.10/pr-3477 upstream/mergify/bp/8.10/pr-3477
git merge upstream/8.10
git push upstream mergify/bp/8.10/pr-3477

@blakerouse blakerouse removed the conflicts There is a conflict in the backported pull request label Oct 3, 2023
@cmacknz
Copy link
Member

cmacknz commented Oct 4, 2023

@blakerouse we need this to resolve some upgrade test flakiness in 8.10.

Example: https://buildkite.com/elastic/elastic-agent/builds/3723#018afb85-d524-49bc-906d-5668a05c5061

@cmacknz cmacknz added the Team:Elastic-Agent Label for the Agent team label Oct 4, 2023
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent (Team:Elastic-Agent)

@elasticmachine
Copy link
Contributor

🌐 Coverage report

Name Metrics % (covered/total) Diff
Packages 98.765% (80/81) 👍
Files 67.596% (194/287) 👎 -0.236
Classes 66.234% (357/539) 👎 -0.247
Methods 53.033% (1119/2110) 👎 -0.078
Lines 38.554% (12725/33006) 👎 -0.01
Conditionals 100.0% (0/0) 💚

@blakerouse blakerouse merged commit 045c84e into 8.10 Oct 5, 2023
10 checks passed
@blakerouse blakerouse deleted the mergify/bp/8.10/pr-3477 branch October 5, 2023 16:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Team:Elastic-Agent Label for the Agent team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants