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 #3427) [Bug] Do not fail when remote PGPs are not available #3449

Merged
merged 4 commits into from
Sep 21, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 20, 2023

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

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

You are currently cherry-picking commit b1d2e6b040.
  (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/1695035111-Resilient-handling-of-air-gapped-PGP-checks.yaml
	modified:   internal/pkg/agent/application/upgrade/artifact/download/fs/verifier.go
	modified:   internal/pkg/agent/application/upgrade/artifact/download/fs/verifier_test.go
	modified:   internal/pkg/agent/application/upgrade/artifact/download/http/verifier.go
	modified:   internal/pkg/agent/application/upgrade/artifact/download/verifier.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	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

* do not fail when remote PGPs are not available

* IT

* changelog

* lint

* https

* Unit test

* make sure default scenario does not yield remote unavailable

* comments applied

* code dedup

* changelog fragment type

* moved check one level up

* Update internal/pkg/agent/application/upgrade/artifact/download/verifier.go

Co-authored-by: Craig MacKenzie <[email protected]>

---------

Co-authored-by: Craig MacKenzie <[email protected]>
(cherry picked from commit b1d2e6b)

# Conflicts:
#	testing/integration/upgrade_test.go
@mergify mergify bot requested a review from a team as a code owner September 20, 2023 23:37
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 20, 2023
@mergify mergify bot requested review from AndersonQ and pchila and removed request for a team September 20, 2023 23:37
@elasticmachine
Copy link
Contributor

elasticmachine commented Sep 20, 2023

💚 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: 2023-09-21T14:11:09.453+0000

  • Duration: 26 min 39 sec

Test stats 🧪

Test Results
Failed 0
Passed 6259
Skipped 57
Total 6316

💚 Flaky test report

Tests succeeded.

🤖 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!)

@elasticmachine
Copy link
Contributor

elasticmachine commented Sep 21, 2023

🌐 Coverage report

Name Metrics % (covered/total) Diff
Packages 98.765% (80/81) 👍
Files 67.719% (193/285) 👍
Classes 66.292% (354/534) 👍
Methods 52.978% (1112/2099) 👍
Lines 38.632% (12688/32843) 👍 0.06
Conditionals 100.0% (0/0) 💚

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

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

@michalpristas
Copy link
Contributor

Skipping IT as per #3397

@michalpristas michalpristas merged commit 369a99f into 8.10 Sep 21, 2023
10 checks passed
@michalpristas michalpristas deleted the mergify/bp/8.10/pr-3427 branch September 21, 2023 15:36
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.

3 participants