Skip to content

Commit 708162c

Browse files
committed
MINOR: Delegate version updates to Gradle in release script (#22031)
Remove `SNAPSHOT` in `version.py`, so `StreamsUpgradeTest.test_app_upgrade` doesn't have following error. ``` TimeoutError("Did expect to read 'Kafka version.*4.2.1.*SNAPSHOT' from ducker@ducker06") Traceback (most recent call last): File "/usr/local/lib/python3.10/dist-packages/ducktape/tests/runner_client.py", line 351, in _do_run data = self.run_test() File "/usr/local/lib/python3.10/dist-packages/ducktape/tests/runner_client.py", line 411, in run_test return self.test_context.function(self.test) File "/usr/local/lib/python3.10/dist-packages/ducktape/mark/_mark.py", line 438, in wrapper return functools.partial(f, *args, **kwargs)(*w_args, **w_kwargs) File "/opt/kafka-dev/tests/kafkatest/tests/streams/streams_application_upgrade_test.py", line 114, in test_app_upgrade self.restart_all_nodes_with(from_version, to_version) File "/opt/kafka-dev/tests/kafkatest/tests/streams/streams_application_upgrade_test.py", line 190, in restart_all_nodes_with self.wait_for_verification(self.processor1, kafka_version_str, self.processor1.LOG_FILE) File "/opt/kafka-dev/tests/kafkatest/tests/streams/streams_application_upgrade_test.py", line 214, in wait_for_verification wait_until(lambda: self.verify_from_file(processor, message, file) >= num_lines, File "/usr/local/lib/python3.10/dist-packages/ducktape/utils/util.py", line 58, in wait_until raise TimeoutError(err_msg() if callable(err_msg) else err_msg) from last_exception ducktape.errors.TimeoutError: Did expect to read 'Kafka version.*4.2.1.*SNAPSHOT' from ducker@ducker06 ``` Reviewers: Chia-Ping Tsai <chia7712@gmail.com> (cherry picked from commit 676712f)
1 parent 5dc96fc commit 708162c

1 file changed

Lines changed: 1 addition & 12 deletions

File tree

release/release.py

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -283,18 +283,7 @@ def delete_gitrefs():
283283

284284
git.create_branch(release_version, f"{git.push_remote_name}/{dev_branch}")
285285
append_fail_hook("Delete gitrefs", delete_gitrefs)
286-
print("Updating version numbers")
287-
textfiles.replace(f"{repo_dir}/gradle.properties", "version", f"version={release_version}")
288-
textfiles.replace(f"{repo_dir}/tests/kafkatest/__init__.py", "__version__", f"__version__ = '{release_version}'")
289-
print("Updating streams quickstart pom")
290-
textfiles.replace(f"{repo_dir}/streams/quickstart/pom.xml", "-SNAPSHOT", "", regex=True)
291-
print("Updating streams quickstart java pom")
292-
textfiles.replace(f"{repo_dir}/streams/quickstart/java/pom.xml", "-SNAPSHOT", "", regex=True)
293-
print("Updating streams quickstart archetype pom")
294-
textfiles.replace(f"{repo_dir}/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml", "-SNAPSHOT", "", regex=True)
295-
print("Updating ducktape version.py")
296-
textfiles.replace(f"{repo_dir}/tests/kafkatest/version.py", "^DEV_VERSION =.*",
297-
f"DEV_VERSION = KafkaVersion(\"{release_version}-SNAPSHOT\")", regex=True)
286+
cmd("Updating version numbers", f"./gradlew updateVersion -PnewVersion={release_version}", cwd=repo_dir)
298287
git.commit(f"Bump version to {release_version}")
299288
git.create_tag(rc_tag)
300289
git.switch_branch(starting_branch)

0 commit comments

Comments
 (0)