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 #3473) [Standalone Agent] Disallow upgrade if upgrade is already in progress #3488

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 29, 2023

This is an automatic backport of pull request #3473 done by Mergify.
Cherry-pick of bc1982a has failed:

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

You are currently cherry-picking commit bc1982aebe.
  (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:
	new file:   changelog/fragments/1695685534-standalone-prevent-quick-upgrades.yaml
	modified:   internal/pkg/agent/application/upgrade/upgrade.go
	modified:   internal/pkg/agent/application/upgrade/upgrade_test.go
	modified:   internal/pkg/agent/cmd/upgrade.go
	modified:   pkg/control/v2/client/client.go
	new file:   pkg/control/v2/client/mocks/client.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   sonar-project.properties
	both modified:   testing/integration/upgrade_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

@mergify mergify bot requested a review from a team as a code owner September 29, 2023 00:42
@mergify mergify bot removed the request for review from a team September 29, 2023 00:42
@mergify mergify bot added the backport label Sep 29, 2023
@mergify mergify bot requested a review from AndersonQ September 29, 2023 00:42
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Sep 29, 2023
@mergify mergify bot requested a review from pchila September 29, 2023 00:42
@elasticmachine
Copy link
Contributor

elasticmachine commented Sep 29, 2023

💔 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-02T18:14:53.455+0000

  • Duration: 6 min 49 sec

Steps errors 1

Expand to view the steps failures

check
  • Took 1 min 2 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 2, 2023

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

…#3473)

* [Standalone] Disallow upgrade if upgrade is already in progress

* Adding CHANGELOG entry

* Add TODOs

* WIP: integration test

* Check for Watcher; move function to upgrade package

* Check Upgrade Watcher PIDs first

* Fix syntax error

* Adjust test to start from older version

* Fixing more errors

* Fix test

* Mock client

* Fix typo

(cherry picked from commit bc1982a)

# Conflicts:
#	sonar-project.properties
#	testing/integration/upgrade_test.go
@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-3473 upstream/mergify/bp/8.10/pr-3473
git merge upstream/8.10
git push upstream mergify/bp/8.10/pr-3473

@pierrehilbert pierrehilbert added the Team:Elastic-Agent Label for the Agent team label Oct 8, 2023
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent (Team:Elastic-Agent)

@mergify
Copy link
Contributor Author

mergify bot commented Oct 9, 2023

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

2 similar comments
@mergify
Copy link
Contributor Author

mergify bot commented Oct 16, 2023

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

@mergify
Copy link
Contributor Author

mergify bot commented Oct 23, 2023

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

@mergify
Copy link
Contributor Author

mergify bot commented Oct 30, 2023

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

@cmacknz
Copy link
Member

cmacknz commented Oct 30, 2023

No more planned 8.10.x releases, closing.

@cmacknz cmacknz closed this Oct 30, 2023
@cmacknz cmacknz deleted the mergify/bp/8.10/pr-3473 branch October 30, 2023 16:38
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 Team:Elastic-Agent Label for the Agent team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants