Sitelet https://github.com/kubernetes/kops/pull/18485/files
Skip to content

scaletest: report experiment variant after kubetest2 runs #18485

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
k8s-ci-robot merged 1 commit into from
Jun 18, 2026
Merged

scaletest: report experiment variant after kubetest2 runs #18485

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
16 changes: 10 additions & 6 deletions tests/e2e/scenarios/scalability/run-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@
set -e
set -x

# Report the experiment variant so TestGrid can show it as a column header.
if [[ -n "${ARTIFACTS:-}" ]]; then
echo "{\"variant\":\"${EXPERIMENT_VARIANT:-base}\"}" > "${ARTIFACTS}/metadata.json"
fi

make test-e2e-install

REPO_ROOT=$(git rev-parse --show-toplevel)
Expand Down Expand Up @@ -261,6 +256,7 @@ if [[ "${SCALE_SCENARIO:performance}" == "correctness" ]]; then
--skip-regex="\[Driver:.gcepd\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:([^L].*|L[^o].*|Lo[^a].*|Loa[^d].*)\]\[KubeUp\]" \
--parallel=25
else
rc=0
kubetest2 kops "${KUBETEST2_ARGS[@]}" \
--up \
--kubernetes-version="${K8S_VERSION}" \
Expand All @@ -270,5 +266,13 @@ else
--provider="${CLOUD_PROVIDER}" \
--repo-root="${GOPATH}"/src/k8s.io/perf-tests \
--kube-config="${HOME}/.kube/config" \
"${CLUSTERLOADER2_ARGS[@]}"
"${CLUSTERLOADER2_ARGS[@]}" || rc=$?

# Add the variant after kubetest2, which would otherwise overwrite metadata.json.

@serathius serathius Jun 18, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you saying there is no feature of kubetest that would ask it to add this metadata for us? We need to hack around and add it ourselves.

@Jefftree Jefftree Jun 18, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't find anything around it, we're the only ones trying to setup a custom testgrid. dra doesn't use kubetest2 so they had no problems with the metadata injection. Can probably add a feature in kubetest2 but that will probably take some effort/time

@serathius serathius Jun 18, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good, thanks for looking into that.

if [[ -n "${ARTIFACTS:-}" ]]; then
if jq --arg v "${EXPERIMENT_VARIANT:-base}" '. + {variant:$v}' "${ARTIFACTS}/metadata.json" >"${ARTIFACTS}/metadata.json.tmp"; then
mv "${ARTIFACTS}/metadata.json.tmp" "${ARTIFACTS}/metadata.json" || true
fi
fi
exit $rc
fi
Loading