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

[7.17](backport #35184) Remove huaweicloud - revert #27607 #37828

Merged
merged 7 commits into from
Feb 1, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 1, 2024

This is an automatic backport of pull request #35184 done by Mergify.
Cherry-pick of 07c559b has failed:

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

You are currently cherry-picking commit 07c559b703.
  (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:   CHANGELOG.next.asciidoc

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   libbeat/processors/add_cloud_metadata/docs/add_cloud_metadata.asciidoc
	deleted by them: libbeat/processors/add_cloud_metadata/provider_huawei_cloud.go
	deleted by them: libbeat/processors/add_cloud_metadata/provider_huawei_cloud_test.go
	both modified:   libbeat/processors/add_cloud_metadata/providers.go

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 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

* Remove huaweicloud - revert #27607

The huaweicloud is just openstack therefore revert #27607 to fix detection of all public and private openstack installations.

* make huawei an alias for openstack

* change doc

* Update CHANGELOG.next.asciidoc

---------

Co-authored-by: kaiyan-sheng <[email protected]>
(cherry picked from commit 07c559b)

# Conflicts:
#	libbeat/processors/add_cloud_metadata/docs/add_cloud_metadata.asciidoc
#	libbeat/processors/add_cloud_metadata/provider_huawei_cloud.go
#	libbeat/processors/add_cloud_metadata/provider_huawei_cloud_test.go
#	libbeat/processors/add_cloud_metadata/providers.go
@mergify mergify bot requested a review from a team as a code owner February 1, 2024 17:15
@mergify mergify bot requested review from fearful-symmetry and faec and removed request for a team February 1, 2024 17:15
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Feb 1, 2024
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Feb 1, 2024
@botelastic
Copy link

botelastic bot commented Feb 1, 2024

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Collaborator

🤖 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 and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@elasticmachine
Copy link
Collaborator

❕ Build Aborted

Either there was a build timeout or someone aborted the build.

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Duration: 34 min 18 sec

🤖 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 and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@elasticmachine
Copy link
Collaborator

💔 Tests 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: 2024-02-01T17:17:27.139+0000

  • Duration: 76 min 34 sec

Test stats 🧪

Test Results
Failed 2
Passed 22344
Skipped 1376
Total 23722

Test errors 2

Expand to view the tests failures

Build&Test / libbeat-unitTest / TestRetrieveHuaweiCloudMetadata – github.com/elastic/beats/v7/libbeat/processors/add_cloud_metadata
    Expand to view the error details

     Failed 
    

    Expand to view the stacktrace

     === RUN   TestRetrieveHuaweiCloudMetadata
        provider_huawei_cloud_test.go:96: 
            	Error Trace:	/var/lib/jenkins/workspace/PR-37828-3-32673a4f-9cdb-43a3-85e7-a2b05092d0ad/src/github.com/elastic/beats/libbeat/processors/add_cloud_metadata/provider_huawei_cloud_test.go:96
            	Error:      	Not equal: 
            	            	expected: {"cloud":{"availability_zone":"cn-east-2b","instance":{"id":"37da9890-8289-4c58-ba34-a8271c4a8216"},"provider":"huawei","region":"cn-east-2","service":{"name":"ECS"}}}
            	            	actual  : {}
            	            	
            	            	Diff:
            	            	--- Expected
            	            	+++ Actual
            	            	@@ -1,13 +1,2 @@
            	            	-(common.MapStr) (len=1) {
            	            	- (string) (len=5) "cloud": (common.MapStr) (len=5) {
            	            	-  (string) (len=17) "availability_zone": (string) (len=10) "cn-east-2b",
            	            	-  (string) (len=8) "instance": (common.MapStr) (len=1) {
            	            	-   (string) (len=2) "id": (string) (len=36) "37da9890-8289-4c58-ba34-a8271c4a8216"
            	            	-  },
            	            	-  (string) (len=8) "provider": (string) (len=6) "huawei",
            	            	-  (string) (len=6) "region": (string) (len=9) "cn-east-2",
            	            	-  (string) (len=7) "service": (common.MapStr) (len=1) {
            	            	-   (string) (len=4) "name": (string) (len=3) "ECS"
            	            	-  }
            	            	- }
            	            	+(common.MapStr) {
            	            	 }
            	Test:       	TestRetrieveHuaweiCloudMetadata
    --- FAIL: TestRetrieveHuaweiCloudMetadata (0.00s)
     
    

Build&Test / libbeat-goIntegTest / TestRetrieveHuaweiCloudMetadata – github.com/elastic/beats/v7/libbeat/processors/add_cloud_metadata
    Expand to view the error details

     Failed 
    

    Expand to view the stacktrace

     === RUN   TestRetrieveHuaweiCloudMetadata
        provider_huawei_cloud_test.go:96: 
            	Error Trace:	/go/src/github.com/elastic/beats/libbeat/processors/add_cloud_metadata/provider_huawei_cloud_test.go:96
            	Error:      	Not equal: 
            	            	expected: {"cloud":{"availability_zone":"cn-east-2b","instance":{"id":"37da9890-8289-4c58-ba34-a8271c4a8216"},"provider":"huawei","region":"cn-east-2","service":{"name":"ECS"}}}
            	            	actual  : {}
            	            	
            	            	Diff:
            	            	--- Expected
            	            	+++ Actual
            	            	@@ -1,13 +1,2 @@
            	            	-(common.MapStr) (len=1) {
            	            	- (string) (len=5) "cloud": (common.MapStr) (len=5) {
            	            	-  (string) (len=17) "availability_zone": (string) (len=10) "cn-east-2b",
            	            	-  (string) (len=8) "instance": (common.MapStr) (len=1) {
            	            	-   (string) (len=2) "id": (string) (len=36) "37da9890-8289-4c58-ba34-a8271c4a8216"
            	            	-  },
            	            	-  (string) (len=8) "provider": (string) (len=6) "huawei",
            	            	-  (string) (len=6) "region": (string) (len=9) "cn-east-2",
            	            	-  (string) (len=7) "service": (common.MapStr) (len=1) {
            	            	-   (string) (len=4) "name": (string) (len=3) "ECS"
            	            	-  }
            	            	- }
            	            	+(common.MapStr) {
            	            	 }
            	Test:       	TestRetrieveHuaweiCloudMetadata
    --- FAIL: TestRetrieveHuaweiCloudMetadata (0.00s)
     
    

Steps errors 7

Expand to view the steps failures

libbeat-unitTest - mage build unitTest
  • Took 3 min 43 sec . View more details here
  • Description: mage build unitTest
libbeat-unitTest - mage build unitTest
  • Took 1 min 6 sec . View more details here
  • Description: mage build unitTest
libbeat-unitTest - mage build unitTest
  • Took 1 min 6 sec . View more details here
  • Description: mage build unitTest
libbeat-goIntegTest - mage goIntegTest
  • Took 10 min 32 sec . View more details here
  • Description: mage goIntegTest
libbeat-goIntegTest - mage goIntegTest
  • Took 4 min 34 sec . View more details here
  • Description: mage goIntegTest
libbeat-goIntegTest - mage goIntegTest
  • Took 3 min 23 sec . View more details here
  • Description: mage goIntegTest
Error signal
  • Took 0 min 0 sec . View more details here
  • Description: Error 'hudson.AbortException: script returned exit code 1'

🐛 Flaky test report

❕ There are test failures but not known flaky tests.

Expand to view the summary

Genuine test errors 2

💔 There are test failures but not known flaky tests, most likely a genuine test failure.

  • Name: Build&Test / libbeat-unitTest / TestRetrieveHuaweiCloudMetadata – github.com/elastic/beats/v7/libbeat/processors/add_cloud_metadata
  • Name: Build&Test / libbeat-goIntegTest / TestRetrieveHuaweiCloudMetadata – github.com/elastic/beats/v7/libbeat/processors/add_cloud_metadata

🤖 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 and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

Copy link
Contributor Author

mergify bot commented Feb 1, 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/7.17/pr-35184 upstream/mergify/bp/7.17/pr-35184
git merge upstream/7.17
git push upstream mergify/bp/7.17/pr-35184

@elasticmachine
Copy link
Collaborator

❕ Build Aborted

Either there was a build timeout or someone aborted the build.

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Duration: 78 min 23 sec

🤖 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 and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@kaiyan-sheng kaiyan-sheng self-assigned this Feb 1, 2024
@elasticmachine
Copy link
Collaborator

💚 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

  • Duration: 91 min 13 sec

❕ 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 and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@kaiyan-sheng kaiyan-sheng enabled auto-merge (squash) February 1, 2024 22:55
@elasticmachine
Copy link
Collaborator

💚 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

  • Duration: 81 min 13 sec

❕ 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 and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@kaiyan-sheng kaiyan-sheng merged commit aba352d into 7.17 Feb 1, 2024
76 checks passed
@kaiyan-sheng kaiyan-sheng deleted the mergify/bp/7.17/pr-35184 branch February 1, 2024 23:59
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 needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants