Skip to content

Conversation

gogochan
Copy link
Collaborator

Change Summary

Integration team used the same file .buildkite/scripts/find_oldest_supported_version.py, and made update to it. https://github.com/elastic/integrations/blob/main/.buildkite/scripts/find_oldest_supported_version.py

This file picks up some of the changes they introduced.

Also adding some condition logic to prevent accidental cancelation of main and 8.12 branch CI job.

Sample values

Buildkite only changes

Release Target

Q/A

For mapping changes:

  • I ran make after making the schema changes, and committed all changes
  • If these field(s) are "exception"-able, I made a companion PR to Kibana adding it (see Readme)
  • If this is a metadata change, I also updated both transform destination schemas to match

For Transform changes:

  • The new transform successfully starts in Kibana
  • The corresponding transform destination schema was updated if necessary
@gogochan gogochan requested a review from a team as a code owner January 17, 2024 21:30
@gogochan gogochan requested review from ferullo and pzl January 17, 2024 21:30
print(find_oldest_supported_version(kibana_version_condition), end="")
kibana_version_condition = ""
if "kibana.version" in manifest_doc["conditions"]:
kibana_version_condition = manifest_doc["conditions"]["kibana.version"]
Copy link
Member

Choose a reason for hiding this comment

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

thanks, this will be nice if we end up having to backport further to 8.11 or something. 8.12 was where we made this yaml change

cancel_intermediate_builds_branch_filter: '!main !8.12'
skip_intermediate_builds: true
# Do accidently skip main or release branch that may be in the middle of releasing
skip_intermediate_builds_branch_filter: '!main !8.12'
Copy link
Member

Choose a reason for hiding this comment

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

can you explain what's going on here?

Copy link
Collaborator Author

@gogochan gogochan Jan 17, 2024

Choose a reason for hiding this comment

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

I meant to say, "do not". I will update the comment. Basically skip_intermediate_builds cancels any currently running CI and starts a new one if the branch gets updated. For PR CI, it is not a big deal, since it doesn't involve signing and publishing. But for main or other releasable branch, we may not want to cancel pending publishing job because the branch was updated.
This setting means, only skip or cancel CI, if target branch is NOT main or NOT 8.12

Copy link
Member

Choose a reason for hiding this comment

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

do we need to extend these things every release? e.g. when we cut an 8.13 release branch should this become !main !8.12 !8.13? I guess that also goes for branch_configuration above.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, unfortunately. The condition does not take regex afaik, and we wouldn't want to have something like 8.*

@gogochan gogochan merged commit 9e16df4 into main Jan 18, 2024
@pzl pzl deleted the bk/fixKibanaVersionCondition branch January 18, 2024 13:59
@elasticmachine
Copy link
Contributor

Package endpoint - 8.13.0 containing this change is available at https://epr.elastic.co/search?package=endpoint

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

Labels

None yet

3 participants