Update release preparation to scripts/release

.pre-commit-config.yaml

@@ -49,5 +49,15 @@ repos:
             "-j0",
             "--rcfile=.pylintrc",
           ]
-        exclude: ^(docs/|changelog.py)
+        exclude: ^(docs/)
         require_serial: true
+
+  # Shell scripts: release tooling and repo githooks. Widen to all *.sh once legacy
+  # scripts under .buildkite/, recipes/, repo root, etc. pass shellcheck.
+  - repo: https://github.com/shellcheck-py/shellcheck-py
+    rev: v0.11.0.1
+    hooks:
+      - id: shellcheck
+        name: shellcheck
+        args: [-x]
+        files: (^scripts/release/.*\.sh$)

CONTRIBUTING.md

@@ -60,7 +60,7 @@ Once your changes and tests are ready to submit for review:
 
     Ensure that all tests pass by running `make check-all`. This runs sequentially lint checks, unit tests and integration tests. These can be executed in isolation using `make lint`, `make test` and `make it` respectively, in case you need to iterate over a subset of tests.
 
-    Note: Integration tests are much slower than unit tests and require `docker-compose`.
+    Note: Integration tests are much slower than unit tests and require `docker compose`. They also require **Java 21**; set `JAVA_HOME` (or `JAVA21_HOME`) to match.
 
 3. Sign the Contributor License Agreement
 
@@ -79,6 +79,10 @@ Then sit back and wait. There will probably be discussion about the pull request
 
 Note: Contributors belonging to the "Elastic" organization on Github can merge PRs themselves after getting a "LGTM" (Looks good to me); this workflow is similar to the established one in the Elasticsearch project.
 
+## Release process (maintainers)
+
+Release preparation is automated via `make release` and scripts under `scripts/release/`; see the Makefile and script headers for details.
+
 # Contributing to the Rally codebase
 
 **Repository:** [https://github.com/elastic/rally](https://github.com/elastic/rally)

Makefile

@@ -67,6 +67,7 @@ check-all: all
 	test-3.11 \
 	test-3.12 \
 	test-3.13 \
+	test-release \
 	it \
 	it_serverless \
 	it_tracks_compat \
@@ -143,7 +144,7 @@ lint: venv
 precommit pre-commit: venv
 	uv run -- pre-commit run
 
-# It install a pre-commit hook in the project .git dir so modified files are checked before creating every commit.
+# It installs a pre-commit hook in the project .git dir so modified files are checked before creating every commit.
 install-pre-commit: $(PRE_COMMIT_HOOK_PATH)
 
 $(PRE_COMMIT_HOOK_PATH):
@@ -216,12 +217,18 @@ benchmark: venv
 
 # --- Release goals ---
 
-release-checks: venv
-	$(VENV_ACTIVATE); ./release-checks.sh $(release_version) $(next_version)
+# usage: e.g. make release-checks RELEASE_VERSION=X.Y.Z
+release-checks test-release: venv
+	@if [ -z "$(RELEASE_VERSION)" ]; then echo "error: set RELEASE_VERSION (e.g. make release-checks RELEASE_VERSION=X.Y.Z)" >&2; exit 1; fi
+	$(MAKE) clean lint test-all docs
+	uv run -- ./scripts/release/prepare.sh --dry "$(RELEASE_VERSION)"
 
-# usage: e.g. make release release_version=0.9.2 next_version=0.9.3
-release: venv release-checks clean docs lint test it
-	$(VENV_ACTIVATE); ./release.sh $(release_version) $(next_version)
+# usage: e.g. make release RELEASE_VERSION=X.Y.Z
+release:
+	@if [ -z "$(RELEASE_VERSION)" ]; then echo "error: set RELEASE_VERSION (e.g. make release RELEASE_VERSION=X.Y.Z)" >&2; exit 1; fi
+	uv run -- ./scripts/release/prepare.sh "$(RELEASE_VERSION)"
+
+# --- Other goals ---
 
 # This is a shortcut for creating a shell running inside the project virtual environment.
 sh:

docs/developing.rst

@@ -8,6 +8,7 @@ Install the following software packages:
 
 * `uv <https://docs.astral.sh/uv/getting-started/installation/>`_ 
 * JDK version required to build Elasticsearch. Please refer to the `build setup requirements <https://github.com/elastic/elasticsearch/blob/main/CONTRIBUTING.md#contributing-to-the-elasticsearch-codebase>`_.
+  For running Rally's integration tests (e.g. ``make it`` or ``make it_tracks_compat``), ensure your environment uses **Java 21** (recent Rally versions use Java 21 in CI). Set ``JAVA_HOME`` or ``JAVA21_HOME`` accordingly.
 * `Docker <https://docs.docker.com/install/>`_ and on Linux additionally `docker-compose <https://docs.docker.com/compose/install/>`_.
 * `jq <https://stedolan.github.io/jq/download/>`_
 * git
@@ -36,7 +37,7 @@ Rally uses automatic code formatters. You can apply them by running ``make forma
 
 However, consider using editor integrations to do it automatically: you'll need to configure `black <https://black.readthedocs.io/en/stable/integrations/editors.html>`_ and `isort <https://github.com/PyCQA/isort/wiki/isort-Plugins>`_.
 
-Also consider running `pre-commit install` to run lint as part of your git commits.
+Also consider running ``make install-pre-commit`` to ensure quick verifications are being performed just before new Git commits are created.
 
 Automatic Updates
 ~~~~~~~~~~~~~~~~~

esrally/utils/io.py

@@ -24,6 +24,7 @@
 import os
 import shutil
 import subprocess
+import sys
 import tarfile
 import zipfile
 from collections.abc import Collection, Mapping, Sequence
@@ -397,7 +398,10 @@ def _do_decompress_manually_with_lib(target_directory: str, filename: str, compr
 
 def _do_tar_decompress(target_directory: str, compressed_file: tarfile.TarFile) -> None:
     try:
-        compressed_file.extractall(path=target_directory, filter="tar")
+        if sys.version_info >= (3, 12):
+            compressed_file.extractall(path=target_directory, filter="tar")
+        else:
+            compressed_file.extractall(path=target_directory)
     except Exception:
         raise RuntimeError(f"Could not decompress provided archive [{compressed_file.name!r}]. Please check if it is a valid tar file.")
     finally:

pyproject.toml

@@ -35,7 +35,7 @@ classifiers = [
 ]
 ################################################################################################
 #
-# Adapt `create-notice.sh` whenever changing dependencies here.
+# Adapt `scripts/release/create-notice.sh` whenever changing dependencies here.
 #
 # That script grabs all license files so we include them in the notice file.
 #
@@ -93,7 +93,7 @@ dependencies = [
     "hatchling==1.6.0",
     "wheel==0.46.2",
     # License: MIT — Rally runs `python -m pip install` to install track dependencies (see esrally.track.loader).
-    "pip>=24.0",
+    "pip==26.0.1",
 ]
 
 [project.optional-dependencies]

scripts/offline-install.sh

@@ -70,7 +70,7 @@ function main {
 
     echo "Preparing NOTICE file"
     __NOTICE_OUTPUT_FILE="${ABSOLUTE_DOWNLOAD_BIN_DIR}/NOTICE.txt"
-    source "${SCRIPT_SRC_HOME}/../create-notice.sh"
+    source "${SCRIPT_SRC_HOME}/release/create-notice.sh"
 
     # create an offline install script
     cat >"${install_script}" <<EOL