Closed mergify[bot] closed 7 hours ago
Cherry-pick of f64785cdd4614f9e092b1cf4d36365ba43d37085 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
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
This pull request has not been merged yet. Could you please review and merge it @pazone? 🙏
Issues
0 New issues
0 Fixed issues
0 Accepted issues
Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code
What does this PR do?
deployment.tf
(thanks @pchila) Example non-sudo test run Full test runFinal 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 testWhy is it important?
Checklist
./changelog/fragments
using the changelog toolDisruptive User Impact
How to test this PR locally
Related issues
-
Questions to ask yourself
This is an automatic backport of pull request #6045 done by Mergify.