diff --git a/scripts/cluster/run-production-acceptance.sh b/scripts/cluster/run-production-acceptance.sh index 177abeb..21b86b8 100755 --- a/scripts/cluster/run-production-acceptance.sh +++ b/scripts/cluster/run-production-acceptance.sh @@ -2533,7 +2533,7 @@ REMOTE cluster_scp "$host:$remote_report" "$local_report" >/dev/null || return 1 cluster_ssh "$host" "[[ ! -e '$remote_report' ]] || unlink '$remote_report'" >/dev/null || true jq -e --arg runId "$run_id" --arg profile "$profile" \ - '.schemaVersion == "acceptance-load-report/v1" and .runId == $runId and .profile == $profile and .secretSafe == true' \ + '.schemaVersion == "acceptance-load-report/v2" and .runId == $runId and .profile == $profile and .secretSafe == true' \ "$local_report" >/dev/null || return 1 return "$status" } @@ -2548,7 +2548,7 @@ merge_remote_load_reports() { def max_field($name): [.[].phases[0][$name] // 0] | max; . as $reports | { - schemaVersion:"acceptance-load-report/v1", + schemaVersion:"acceptance-load-report/v2", runId:$reports[0].runId, profile:$profile, startedAt:([$reports[].startedAt] | min), @@ -3601,7 +3601,7 @@ REMOTE cluster_ssh "$CLUSTER_NINGBO_HOST" "[[ ! -e '$remote_report' ]] || unlink '$remote_report'" >/dev/null || true chmod 0600 "$report_path" jq -e --arg runId "$run_id" --arg profile "$profile" \ - '.schemaVersion == "acceptance-load-report/v1" and .runId == $runId and .profile == $profile and .secretSafe == true' \ + '.schemaVersion == "acceptance-load-report/v2" and .runId == $runId and .profile == $profile and .secretSafe == true' \ "$report_path" >/dev/null || return 1 (( status == 0 )) && jq -e '.passed == true' "$report_path" >/dev/null } diff --git a/tests/release/production-acceptance-script-test.sh b/tests/release/production-acceptance-script-test.sh index 37da5e8..093b97f 100755 --- a/tests/release/production-acceptance-script-test.sh +++ b/tests/release/production-acceptance-script-test.sh @@ -7,6 +7,11 @@ tmp=$(mktemp -d) trap 'rm -rf "$tmp"' EXIT script=$root/scripts/cluster/run-production-acceptance.sh +grep -Fq 'acceptance-load-report/v2' "$script" +if grep -Fq 'acceptance-load-report/v1' "$script"; then + echo 'production acceptance still requires the obsolete load report v1 schema' >&2 + exit 1 +fi # shellcheck source=scripts/cluster/common.sh source "$root/scripts/cluster/common.sh"