Skip to content

Conversation

@ruflin
Copy link
Contributor

@ruflin ruflin commented Nov 4, 2021

Make it compatible with 7.16 and 8.x

I chose to make it compatible with 7.16.x and 8.0.x. It means we need to publish a new package for 8.1.0 and upwards. I did not want to use all 8.x compatibility as I was not sure it will hold true. This gives us some time to figure it out.
@ruflin ruflin requested review from jsoriano and mtojek November 4, 2021 08:02
@ruflin
Copy link
Contributor Author

ruflin commented Nov 4, 2021

@mtojek @jsoriano I would really like to get your feedback on this change. I'm aware that might not scale well for all packages but it gets the job done for now.

@elasticmachine
Copy link

elasticmachine commented Nov 4, 2021

💚 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: 2021-11-05T10:14:10.765+0000

  • Duration: 14 min 10 sec

  • Commit: 4cc8499

Test stats 🧪

Test Results
Failed 0
Passed 30
Skipped 0
Total 30

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.
categories: ["elastic_stack"]
conditions:
kibana.version: "^7.15.0"
kibana.version: "^7.16.0 || 8.0.x"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@mtojek Is it possible that this kind of strings is not supported at the moment by the validation? It should work with the golang lib used for semver.

Copy link
Member

Choose a reason for hiding this comment

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

I think this should be ^7.16.0 || ^8.0.0, but our Jenkins pipelines don't support it yet, see elastic/apm-pipeline-library#1359

Copy link
Member

Choose a reason for hiding this comment

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

I am trying a similar approach in #2122

Copy link
Member

Choose a reason for hiding this comment

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

Oh, to be compatible with all minors, the golang lib supports ~: ^7.16.0 || ~8.0.0, but we would also need to add support for this in the Jenkins pipelines to find the version to use for testing.

Copy link
Contributor

@mtojek mtojek left a comment

Choose a reason for hiding this comment

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

LGTM.

Please remember to promote the package to the production stage.

@ruflin
Copy link
Contributor Author

ruflin commented Nov 5, 2021

I updated this PR based on my comment in elastic/elastic-package#571 (comment) Likely needs another round of review.

version: 1.3.0
release: ga
description: Collect metrics from Elastic Agents.
description: Collect logs and metrics from Elastic Agents.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@endorama Does that look good?

categories: ["elastic_stack"]
conditions:
kibana.version: "^7.15.0"
kibana.version: "^7.16.0 || ^8.0.0"
Copy link
Member

Choose a reason for hiding this comment

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

For fleet server you are using ^7.16.0 || ~8.0.0 now https://github.com/elastic/integrations/pull/2133/files#diff-74af037e0c513145506487bbcc03212b709b15b581a313e6dae23336681e78b5R11

Do we want a different thing for the agent?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, this is a "failure" on my end to push the changes I made in fleet-server too :-(

@ruflin ruflin merged commit aa1a3e1 into elastic:master Nov 5, 2021
@ruflin ruflin deleted the update-compatiblity-elastic_agent-package branch November 5, 2021 14:13
@ruflin
Copy link
Contributor Author

ruflin commented Nov 5, 2021

Getting this in and promoting to staging. I'll push to production as soon as @andresrc also gives his 👍

@andresrc
Copy link
Contributor

andresrc commented Nov 9, 2021

I'm 👍 for this package (and fleet server) the part I'm not sure if this is what we should do with all packages

@jsoriano
Copy link
Member

jsoriano commented Nov 9, 2021

Change for Apache package as example for other packages: #2122

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

5 participants