Mickael Maison created KAFKA-19528: -------------------------------------- Summary: Release script does not handle doing multiple release candidates Key: KAFKA-19528 URL: https://issues.apache.org/jira/browse/KAFKA-19528 Project: Kafka Issue Type: Bug Components: release Reporter: Mickael Maison
The release script sets the release version, for example 4.1.0, and commits that to the release branch, for example: https://github.com/apache/kafka/commit/57e81f201055b58f94febf0509bfc8acba632854 When rerunning the script for another release candidate, it tries again to set the version and commit to the branch. However the commit fails as there is nothing to commit the diff is empty. {noformat} python release.py Using preferences from: /Users/mickael/github/kafka/release/.release-settings.json Assuming: did_verify_requirements = True Assuming: did_verify_gpg_key_616fd9543fd4381f12c37b700a6789c24523cc375f63f5868bba4fe7aa241e0f06a8aac7b208797a70581f1a0fea0128b57e9eb396ed80cc4b4d93e66d5302d1 = True Assuming: apache_id = mimaison Assuming: jdk21 = /Users/mickael/.sdkman/candidates/java/21.0.7-tem Assuming: did_verify_prerequeisites = True Fetching tags from upstream $ git fetch --tags upstream > Release version 4.1.0 candidate number: 1 Creating git branch 4.1.0 to track upstream/4.1 $ git checkout -b 4.1.0 upstream/4.1 > Switched to a new branch '4.1.0' > branch '4.1.0' set up to track 'upstream/4.1'. Updating version numbers Updating streams quickstart pom Updating streams quickstart java pom Updating streams quickstart archetype pom Updating ducktape version.py Updating docs templateData.js Committing git changes $ ['git', 'commit', '-a', '-m', 'Bump version to 4.1.0'] On branch 4.1.0 Your branch is up to date with 'upstream/4.1'. nothing to commit, working tree clean Retry? (y/n): y On branch 4.1.0 Your branch is up to date with 'upstream/4.1'. nothing to commit, working tree clean Retry? (y/n): n ************************************************* *** First command failure occurred here. *** *** Will now try to clean up working state. *** ************************************************* Resetting branch $ git reset --hard HEAD > HEAD is now at e4e2dce2eb KAFKA-19522: avoid electing fenced lastKnownLeader > (#20200) Deleting git branch 4.1.0 $ git branch -D 4.1.0 > Deleted branch 4.1.0 (was e4e2dce2eb). FAILURE: {noformat} -- This message was sent by Atlassian Jira (v8.20.10#820010)