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 #3378) Refactor pkg/testing and small improvements to testing/integration #3536

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 5, 2023

This is an automatic backport of pull request #3378 done by Mergify.
Cherry-pick of 2201b6d has failed:

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

You are currently cherry-picking commit 2201b6d549.
  (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:   pkg/component/runtime/manager_test.go
	modified:   pkg/testing/fixture_install.go
	deleted:    pkg/testing/tools/agents.go
	modified:   pkg/testing/tools/artifacts_api.go
	modified:   pkg/testing/tools/check/check.go
	renamed:    pkg/testing/tools/elasticsearch.go -> pkg/testing/tools/estools/elasticsearch.go
	modified:   testing/integration/diagnostics_test.go
	modified:   testing/integration/endpoint_security_test.go
	modified:   testing/integration/fqdn_test.go
	modified:   testing/integration/monitoring_logs_test.go
	modified:   testing/integration/proxy_url_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: pkg/testing/tools/cmd.go
	both modified:   pkg/testing/tools/fleettools/fleet.go
	both modified:   pkg/testing/tools/tools.go
	deleted by us:   testing/integration/upgrade_fleet_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

* pkg/testing/tools
  - split the 'tools' into smaller packages with well defined scope: 'estools', 'fleettools' and 'check'
  - adjust method names for consistency

* testing/integration:
  - make diagnostics to require to be run on a remote host
  - add more context to errors
  - reorder functions on endpoint_security_test so tests are the first functions and when the test fails because the 'Endpoint' directory isn't removed, it now prints the content of the directory

(cherry picked from commit 2201b6d)

# Conflicts:
#	pkg/testing/tools/cmd.go
#	pkg/testing/tools/fleettools/fleet.go
#	pkg/testing/tools/tools.go
#	testing/integration/upgrade_fleet_test.go
@mergify mergify bot requested a review from a team as a code owner October 5, 2023 13:37
@mergify mergify bot removed the request for review from a team October 5, 2023 13:37
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 5, 2023
@mergify mergify bot requested review from blakerouse and pchila October 5, 2023 13:37
@elasticmachine
Copy link
Contributor

💔 Build Failed

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-05T13:37:32.221+0000

  • Duration: 5 min 47 sec

Steps errors 1

Expand to view the steps failures

check
  • Took 0 min 1 sec . View more details here
  • Description: make check-ci

❕ Flaky test report

No test was executed to be analysed.

🤖 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 5, 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-3378 upstream/mergify/bp/8.10/pr-3378
git merge upstream/8.10
git push upstream mergify/bp/8.10/pr-3378

@AndersonQ
Copy link
Member

there will be no more 8.10.x releases

@AndersonQ AndersonQ closed this Oct 6, 2023
@mergify mergify bot deleted the mergify/bp/8.10/pr-3378 branch October 6, 2023 09:41
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