Skip to content

[DON'T MERGE] test Feature arch v2 with cloudbeat#1037

Closed
eyalkraft wants to merge 3 commits intoelastic:feature-arch-v2from
eyalkraft:feature-arch-v2
Closed

[DON'T MERGE] test Feature arch v2 with cloudbeat#1037
eyalkraft wants to merge 3 commits intoelastic:feature-arch-v2from
eyalkraft:feature-arch-v2

Conversation

@eyalkraft
Copy link
Copy Markdown
Contributor

@eyalkraft eyalkraft commented Aug 29, 2022 •
edited
Loading

Changes-

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Aug 29, 2022

💔 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: 2022-08-29T13:37:56.115+0000

  • Duration: 4 min 50 sec

Steps errors 1

Expand to view the steps failures

check
  • Took 0 min 11 sec . View more details here
  • Description: make check-ci

❕ Flaky test report

No test was executed to be analysed.

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

@eyalkraft eyalkraft mentioned this pull request Aug 29, 2022
Closed
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Aug 31, 2022

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 feature-arch-v2 upstream/feature-arch-v2
git merge upstream/feature-arch-v2
git push upstream feature-arch-v2

cmacknz
cmacknz reviewed Sep 1, 2022
View reviewed changes
magefile.go
}

targetPath := filepath.Join(archivePath, rp)
os.MkdirAll(targetPath, 0755)
Copy link
Copy Markdown
Member

@cmacknz cmacknz Sep 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I hit the same problem, fixed in #1058

cmacknz
cmacknz reviewed Sep 1, 2022
View reviewed changes
go.mod
github.com/fsnotify/fsnotify => github.com/adriansr/fsnotify v1.4.8-0.20211018144411-a81f2b630e7c
github.com/tonistiigi/fifo => github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c
//github.com/elastic/beats/v7 => github.com/fearful-symmetry/beats/v7 v1.2.2-0.20220825171527-b0d25807e2ab
github.com/elastic/beats/v7 => github.com/eyalkraft/beats/v7 v7.0.0-testv2 // forked from ^
Copy link
Copy Markdown
Member

@cmacknz cmacknz Sep 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we need this on the agent side.

cmacknz
cmacknz reviewed Sep 1, 2022
View reviewed changes
version/version.go
package version

const defaultBeatVersion = "8.4.0"
const defaultBeatVersion = "8.5.0"
Copy link
Copy Markdown
Member

@cmacknz cmacknz Sep 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in the feature-arch-v2 branch via backport from main

@cmacknz
Copy link
Copy Markdown
Member

cmacknz commented Sep 1, 2022

Closing this, the necessary fixes have already been merged separately. Thanks!

@cmacknz cmacknz closed this Sep 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cmacknz cmacknz cmacknz left review comments

Assignees

@eyalkraft eyalkraft

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@eyalkraft @elasticmachine @cmacknz