Skip to content

[Backport 9.1] yaml tests: more improvements to branching logic #3200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 21, 2025
Merged

[Backport 9.1] yaml tests: more improvements to branching logic #3200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .buildkite/run-tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ export TEST_SUITE="${TEST_SUITE:=platinum}"
export PYTHON_VERSION="${PYTHON_VERSION:=3.14}"
export PYTHON_CONNECTION_CLASS="${PYTHON_CONNECTION_CLASS:=urllib3}"
export ES_YAML_TESTS_BRANCH="${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
if [[ ! -n "$ES_YAML_TESTS_BRANCH" ]]; then
export ES_YAML_TESTS_BRANCH="${BUILDKITE_BRANCH}"
fi

script_path=$(dirname $(realpath $0))
source $script_path/functions/imports.sh
Expand Down
4 changes: 2 additions & 2 deletions test_elasticsearch/test_server/test_rest_api_spec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,10 +503,10 @@ def remove_implicit_resolver(cls, tag_to_remove):
if "ES_YAML_TESTS_BRANCH" in os.environ and os.environ["ES_YAML_TESTS_BRANCH"]:
branch_candidates.append(os.environ["ES_YAML_TESTS_BRANCH"])
git_branch = subprocess.getoutput("git branch --show-current")
if git_branch not in branch_candidates:
if git_branch and git_branch not in branch_candidates:
branch_candidates.append(git_branch)
package_version = __versionstr__.rsplit(".", 1)[0]
if package_version not in branch_candidates:
if package_version and package_version not in branch_candidates:
branch_candidates.append(package_version)
if "main" not in branch_candidates:
branch_candidates.append("main")
Expand Down