Skip to content

[8.x](backport #6045) [CI] BK Integration tests: Run non-sudo tests#6087

Merged
oakrizan merged 1 commit into8.xfrom
mergify/bp/8.x/pr-6045
Nov 25, 2024
Merged

[8.x](backport #6045) [CI] BK Integration tests: Run non-sudo tests#6087
oakrizan merged 1 commit into8.xfrom
mergify/bp/8.x/pr-6045

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 19, 2024

What does this PR do?

Final test run (after I applied the proposed changes) failed. But the reason is known : TestDebLogIngestFleetManaged/Monitoring_logs_are_shipped failed. Raised a PR that fixes this test

Why is it important?

Checklist

  • 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 #6045 done by [Mergify](https://mergify.com).

@mergify mergify bot added the backport label Nov 19, 2024
@mergify mergify bot requested a review from a team as a code owner November 19, 2024 20:57
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Nov 19, 2024
@mergify mergify bot requested a review from a team as a code owner November 19, 2024 20:57
@mergify mergify bot requested review from andrzej-stencel and michel-laterman and removed request for a team November 19, 2024 20:57
@mergify mergify bot assigned pazone Nov 19, 2024
@mergify
Copy link
Contributor Author

mergify bot commented Nov 19, 2024

Cherry-pick of f64785c has failed:

On branch mergify/bp/8.x/pr-6045
Your branch is up to date with 'origin/8.x'.

You are currently cherry-picking commit f64785cdd4.
  (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:   .buildkite/scripts/steps/integration_tests_tf.sh
	deleted:    .buildkite/scripts/sudo-integration-tests.sh
	modified:   test_infra/ess/deployment.tf

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .buildkite/bk.integration.pipeline.yml
	both modified:   .buildkite/scripts/buildkite-integration-tests.sh
	deleted by us:   .buildkite/scripts/integration-tests.ps1
	deleted by them: .buildkite/scripts/steps/integration_tests_tf_sudo.sh

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

@mergify
Copy link
Contributor Author

mergify bot commented Nov 21, 2024

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.x/pr-6045 upstream/mergify/bp/8.x/pr-6045
git merge upstream/8.x
git push upstream mergify/bp/8.x/pr-6045

@mergify
Copy link
Contributor Author

mergify bot commented Nov 25, 2024

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

@pierrehilbert pierrehilbert requested a review from pazone November 25, 2024 08:02
@oakrizan oakrizan marked this pull request as draft November 25, 2024 10:24
@oakrizan oakrizan self-assigned this Nov 25, 2024
@oakrizan oakrizan force-pushed the mergify/bp/8.x/pr-6045 branch 4 times, most recently from d4e0702 to 98defe7 Compare November 25, 2024 17:00
* Sudo test script refactoring

* sudo param

* Test non-sudo

* Added apm to TF deployment

* Test build non-sudo

* removed apm

* Fix Kibana config

* Fix Kibana config

* Fix Kibana config

* Non-sudo test run

* Non-sudo test run

* Cleanup

* Cleanup

* stop reading system log files for OtelTest

* Renamed sudo-integration-tests.sh to buildkite-integration-tests.sh

---------

Co-authored-by: Lee E. Hinman <lee.e.hinman@elastic.co>
(cherry picked from commit f64785c)
@oakrizan oakrizan force-pushed the mergify/bp/8.x/pr-6045 branch from 98defe7 to 92292ff Compare November 25, 2024 19:07
@oakrizan oakrizan added ci and removed conflicts There is a conflict in the backported pull request labels Nov 25, 2024
Copy link
Contributor

@oakrizan oakrizan left a comment

Choose a reason for hiding this comment

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

resolved conflicts

@oakrizan oakrizan marked this pull request as ready for review November 25, 2024 19:12
@oakrizan oakrizan enabled auto-merge (squash) November 25, 2024 19:12
@elastic-sonarqube
Copy link

@oakrizan oakrizan merged commit b1d483b into 8.x Nov 25, 2024
@oakrizan oakrizan deleted the mergify/bp/8.x/pr-6045 branch November 25, 2024 21:27
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.

3 participants