Skip to content
This repository was archived by the owner on Sep 17, 2024. It is now read-only.

[7.15](backport #1740) Support running tests in full VM's#1856

Merged
mdelapenya merged 5 commits into
7.15from
mergify/bp/7.15/pr-1740
Dec 15, 2021
Merged

[7.15](backport #1740) Support running tests in full VM's#1856
mdelapenya merged 5 commits into
7.15from
mergify/bp/7.15/pr-1740

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Nov 30, 2021

This is an automatic backport of pull request #1740 done by Mergify.
Cherry-pick of 8a94011 has failed:

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

You are currently cherry-picking commit 8a940112.
  (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:   .ci/.e2e-tests-for-elastic-agent.yaml
	new file:   .ci/README.md
	new file:   .ci/ansible/playbook.yml
	new file:   .ci/ansible/requirements.yml
	new file:   .ci/ansible/tasks/copy_test_files.yml
	new file:   .ci/ansible/tasks/install_deps.yml
	new file:   .ci/ansible/tasks/runners.yml
	new file:   .ci/ansible/tasks/setup_test_script.yml
	new file:   .ci/ansible/tasks/teardown.yml
	new file:   .ci/ansible/tasks/wait_for_ssh.yml
	modified:   .ci/scripts/install-test-dependencies.sh
	modified:   NOTICE.txt
	modified:   e2e/_suites/fleet/features/agent_endpoint_integration.feature
	modified:   e2e/_suites/fleet/features/backend_processes.feature
	modified:   e2e/_suites/fleet/features/linux_integration.feature
	modified:   e2e/_suites/fleet/features/permission_output_change.feature
	modified:   e2e/_suites/fleet/features/running_on_top_of_beats.feature
	modified:   e2e/_suites/fleet/features/system_integration.feature
	modified:   e2e/_suites/fleet/ingest_manager_test.go
	new file:   e2e/_suites/fleet/testresources/default_system_metrics.json
	modified:   go.mod
	modified:   internal/action/base.go
	modified:   internal/action/process.go
	modified:   internal/deploy/remote.go
	modified:   internal/elasticsearch/client.go
	modified:   internal/installer/elasticagent_tar.go
	modified:   internal/kibana/client.go
	modified:   internal/kibana/fleet.go
	modified:   internal/kibana/integrations.go
	modified:   internal/kibana/policies.go
	modified:   internal/kibana/url_prefixes.go
	modified:   internal/utils/utils.go
	modified:   internal/utils/utils_test.go
	modified:   notice/overrides.json

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .ci/.e2e-tests.yaml
	both modified:   .ci/Jenkinsfile
	both modified:   .gitignore
	both modified:   e2e/_suites/fleet/features/fleet_mode_agent.feature
	deleted by us:   e2e/_suites/fleet/features/preconfigured_policies.feature
	both modified:   e2e/_suites/fleet/fleet.go
	both modified:   go.sum

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

* Support running e2e in VM's

Signed-off-by: Adam Stokes <51892+adam-stokes@users.noreply.github.com>
Co-authored-by: Manuel de la Peña <mdelapenya@gmail.com>
(cherry picked from commit 8a94011)

# Conflicts:
#	.ci/.e2e-tests.yaml
#	.ci/Jenkinsfile
#	.gitignore
#	e2e/_suites/fleet/features/fleet_mode_agent.feature
#	e2e/_suites/fleet/features/preconfigured_policies.feature
#	e2e/_suites/fleet/fleet.go
#	go.sum
@mergify mergify Bot added the conflicts There is a conflict in the backported pull request label Nov 30, 2021
Signed-off-by: Adam Stokes <51892+adam-stokes@users.noreply.github.com>
@adam-stokes adam-stokes removed the conflicts There is a conflict in the backported pull request label Nov 30, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Nov 30, 2021

💚 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: 2021-12-15T08:59:43.619+0000

  • Duration: 31 min 28 sec

  • Commit: f16908e

Test stats 🧪

Test Results
Failed 0
Passed 81
Skipped 0
Total 81

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

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

  • /test : Re-trigger the build.

@adam-stokes
Copy link
Copy Markdown
Contributor

@mdelapenya are we missing a back port here?

The backport added a reference to code implemented in:

   Test preconfigured agent policies and output  (#1680)

But this PR was not backported to 7.15 because there is no support to
preconfigured policies.
}
env := fts.getProfileEnv()
err := fts.deployer.Add(fts.currentContext, deploy.NewServiceRequest(common.FleetProfileName), services, env)
err := fts.deployer.Add(fts.currentContext, deploy.NewServiceRequest(common.FleetProfileName), services, common.ProfileEnv)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed the reference to the method, as it was not backported to 7.15 because there is no support to
preconfigured policies.

cc/ @adam-stokes

@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 6, 2021

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

1 similar comment
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 13, 2021

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

@mdelapenya mdelapenya merged commit c6e8d16 into 7.15 Dec 15, 2021
@mergify mergify Bot deleted the mergify/bp/7.15/pr-1740 branch December 15, 2021 10:49
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants