Skip to content

Hash both kafka and kafka-connect subtrees in BUILD_TREE_HASH#2411

Merged
bert-e merged 1 commit into
development/2.14from
improvement/ZENKO-5275/build-tree-hash-kafka-connect
May 16, 2026
Merged

Hash both kafka and kafka-connect subtrees in BUILD_TREE_HASH#2411
bert-e merged 1 commit into
development/2.14from
improvement/ZENKO-5275/build-tree-hash-kafka-connect

Conversation

@delthas
Copy link
Copy Markdown
Contributor

@delthas delthas commented May 11, 2026 •
edited
Loading

Summary

  • solution/kafka_build_vars.sh:24 now hashes both solution/kafka and solution/kafka-connect into the shared BUILD_TREE_HASH suffix used by both image tags. Same 40-char hex format, drop-in for all consumers.

Context

BUILD_TREE_HASH was previously git rev-parse HEAD:solution/kafka — a tree hash covering only the kafka subtree. The same value is used as the suffix in both image tags:

  • ${KAFKA_IMAGE}:${KAFKA_TAG}-${BUILD_TREE_HASH} (kafka image)
  • ${KAFKA_CONNECT_IMAGE}:${KAFKA_CONNECT_TAG}-${BUILD_TREE_HASH} (kafka-connect image)

Touched in .github/workflows/end2end.yaml:346,361, solution/zenkoversion.yaml:99,102, .github/scripts/end2end/configure-e2e*.sh, solution/build.sh:88.

Because the hash didn't include solution/kafka-connect, any change to that subtree (Dockerfile edits, new plugins, build-arg additions) silently overwrote the existing kafka-connect image at the same tag in the registry. Surfaced during ZENKO-5274 (the SMT plugin being baked into a kafka-connect image whose tag was unchanged from development/2.14).

Approach

Combine the tree hashes of both subtrees via sha1sum. Considered a per-image hash variable (so the kafka image would only re-tag when solution/kafka changes); rejected because the existing infrastructure assumes a single shared BUILD_TREE_HASH suffix across both images.

Issue: ZENKO-5275

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented May 11, 2026

Hello delthas,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Available options
name description privileged authored
/after_pull_request Wait for the given pull request id to be merged before continuing with the current one.
/bypass_author_approval Bypass the pull request author's approval ⭐
/bypass_build_status Bypass the build and test status ⭐
/bypass_commit_size Bypass the check on the size of the changeset TBA ⭐
/bypass_incompatible_branch Bypass the check on the source branch prefix ⭐
/bypass_jira_check Bypass the Jira issue check ⭐
/bypass_peer_approval Bypass the pull request peers' approval ⭐
/bypass_leader_approval Bypass the pull request leaders' approval ⭐
/approve Instruct Bert-E that the author has approved the pull request. ✍️
/create_pull_requests Allow the creation of integration pull requests.
/create_integration_branches Allow the creation of integration branches.
/no_octopus Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
/unanimity Change review acceptance criteria from one reviewer at least to all reviewers
/wait Instruct Bert-E not to run until further notice.
Available commands
name description privileged
/help Print Bert-E's manual in the pull request.
/status Print Bert-E's current status in the pull request TBA
/clear Remove all comments from Bert-E from the history TBA
/retry Re-start a fresh build TBA
/build Re-start a fresh build TBA
/force_reset Delete integration branches & pull requests, and restart merge process from the beginning.
/reset Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented May 11, 2026

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

@francoisferrand francoisferrand requested review from a team, DarkIsDude and SylvainSenechal May 13, 2026 20:12
@delthas delthas requested review from a team, benzekrimaha and maeldonn and removed request for a team, DarkIsDude and SylvainSenechal May 15, 2026 09:07
@francoisferrand
Copy link
Copy Markdown
Contributor

francoisferrand commented May 15, 2026

/after_pull_request=2417

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented May 15, 2026

Waiting for other pull request(s)

The current pull request is locked by the after_pull_request option.

In order for me to merge this pull request, run the following actions first:

➡️ Merge the OPEN pull request:

Alternatively, delete all the after_pull_request comments from this pull request.

The following options are set: after_pull_request

@francoisferrand francoisferrand force-pushed the improvement/ZENKO-5275/build-tree-hash-kafka-connect branch from 71744a5 to 1725279 Compare May 15, 2026 11:32
@francoisferrand francoisferrand changed the base branch from development/2.14 to improvement/ZENKO-5271/skip-trailing-sleep May 15, 2026 11:32
@delthas
Copy link
Copy Markdown
Contributor Author

delthas commented May 15, 2026

/approve

@delthas @francoisferrand
Hash both kafka and kafka-connect subtrees in BUILD_TREE_HASH
8bca2da 
solution/kafka_build_vars.sh previously hashed only solution/kafka.
The same suffix is used for both the kafka and kafka-connect image
tags (.github/workflows/end2end.yaml, solution/zenkoversion.yaml),
so changes to solution/kafka-connect produced rebuilt images that
were pushed under the existing tag — last-write-wins, no rebuild
signal downstream.

Combine the tree hashes of both subtrees via sha1sum so any change
to either subtree invalidates the shared tag suffix. Same 40-char
hex format, drop-in for all consumers.

Considered a per-image hash variable so the kafka image would only
re-tag when solution/kafka changes; rejected because the existing
infrastructure assumes a single shared BUILD_TREE_HASH suffix across
both images (solution/zenkoversion.yaml:99,102).

After this lands, the first build produces a new tag for both images
because the hashing algorithm itself changed. Old tags stay in the
registry as historical artefacts.

Issue: ZENKO-5275
@francoisferrand francoisferrand force-pushed the improvement/ZENKO-5275/build-tree-hash-kafka-connect branch from 1725279 to 8bca2da Compare May 15, 2026 14:36
@francoisferrand francoisferrand force-pushed the improvement/ZENKO-5271/skip-trailing-sleep branch from 027554f to 2d7a841 Compare May 15, 2026 14:36
Base automatically changed from improvement/ZENKO-5271/skip-trailing-sleep to development/2.14 May 15, 2026 23:56
@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented May 15, 2026

Waiting for other pull request(s)

The current pull request is locked by the after_pull_request option.

In order for me to merge this pull request, run the following actions first:

➡️ Merge the OPEN pull request:

Alternatively, delete all the after_pull_request comments from this pull request.

The following options are set: after_pull_request, approve

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented May 16, 2026

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/2.14

  • ✔️ development/2.15

The following branches have NOT changed:

  • development/2.10
  • development/2.11
  • development/2.12
  • development/2.13
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Please check the status of the associated issue ZENKO-5275.

Goodbye delthas.

The following options are set: after_pull_request, approve

@bert-e bert-e merged commit 8bca2da into development/2.14 May 16, 2026
55 of 58 checks passed
@bert-e bert-e deleted the improvement/ZENKO-5275/build-tree-hash-kafka-connect branch May 16, 2026 09:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@francoisferrand francoisferrand francoisferrand approved these changes

@maeldonn maeldonn maeldonn approved these changes

@benzekrimaha benzekrimaha benzekrimaha approved these changes

@DarkIsDude DarkIsDude Awaiting requested review from DarkIsDude

@SylvainSenechal SylvainSenechal Awaiting requested review from SylvainSenechal

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@delthas @bert-e @francoisferrand @maeldonn @benzekrimaha