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.15](backport #5764) Retrying choco install #5770

Merged
merged 3 commits into from
Oct 18, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 13, 2024

Retrying the choco install step to reduce the flakiness of integration test runs.


This is an automatic backport of pull request #5764 done by Mergify.

(cherry picked from commit d6da7eb)

# Conflicts:
#	pkg/testing/runner/windows.go
@mergify mergify bot requested a review from a team as a code owner October 13, 2024 12:43
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 13, 2024
@mergify mergify bot requested review from andrzej-stencel and pchila and removed request for a team October 13, 2024 12:43
Copy link
Contributor Author

mergify bot commented Oct 13, 2024

Cherry-pick of d6da7eb has failed:

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

You are currently cherry-picking commit d6da7eb25d.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/testing/runner/windows.go

no changes added to commit (use "git add" and/or "git commit -a")

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

Copy link
Contributor Author

mergify bot commented Oct 14, 2024

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

@rowlandgeoff
Copy link
Contributor

Did some digging. Looks like these failures are due to the 7.17.25 FF and will likely be resolved once https://github.com/elastic/elastic-agent/actions/workflows/bump-agent-versions.yml runs and the resulting PR is merged.

@rowlandgeoff rowlandgeoff enabled auto-merge (squash) October 18, 2024 03:00
Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

@rowlandgeoff rowlandgeoff merged commit cd7202b into 8.15 Oct 18, 2024
13 checks passed
@rowlandgeoff rowlandgeoff deleted the mergify/bp/8.15/pr-5764 branch October 18, 2024 04:27
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