mirror of
https://github.com/hanzoai/team.git
synced 2026-09-30 01:57:35 +00:00
* ci: shard server Postgres tests into 4 parallel runners (#35739) Cherry-pick of00296f9b49from master. * updated go to version 1.25.8 (#35817) Cherry-pick of32a10bac62from master. * Move password hashers from server/v8 to server/public (#35805) Cherry-pick ofcca3f08574from master. * Generate instead of hard-coding test passwords, enforce new minimum for FIPS, shard CI, fix FIPS builds (#35905) Cherry-pick of1bdd985b41from master. * upgrade golangci-lint (#35845) Cherry-pick of157e0400b2from master. On release-11.4 (unlike 11.5), UpdatePostsChannelTypeByChannelId and BackfillPostsChannelType exist in the elasticsearch/opensearch files, so the imports they require (fmt, updatebyquery, scriptlanguage) must be added — they were not in the cherry-pick diff since they already existed on master. Also updates html2text/tablewriter/olekukonko deps to fix a workspace conflict where enterprise's Go 1.25.8 bump pulled in a newer html2text that requires tablewriter ≥ 1.1 (was pinned to 0.0.5 via a replace directive). Matches the subset of866f759e4b(Mm 66662 bump deps) relevant to this incompatibility. * Fix FIPS-incompatible passwords and config in e2e test suites (#36001) Cherry-pick ofb51b4a8937from master. release-11.4 differences vs release-11.5: - demo_plugin_installation.spec.ts also deleted (modify/delete conflict, git rm) - authentication_2_spec.ts conflict: HEAD missing check() call; took incoming (check + FIPS-length passwords) - member_invitation_ui_spec.ts: HEAD has 'Create Account' (capital A) matching release-11.4 button text; kept HEAD's button text with incoming's newTestPassword() * fix(cypress): demo plugin (#36056) Cherry-pick of39f1979aa5from master. demo_plugin_installation.spec.ts was deleted in step 10 (modify/delete); re-created here with both the FIPS-password change and the URL fix. * test: clean up channel store data after TestChannelStore (#36066) TestChannelStore sub-tests create channels, members, and team members using fake TeamIds and UserIds (model.NewId() for non-existent rows). These records are left in the database and cause integrity tests (TestCheck*) running in the same binary to fail their full-table scans. Register a t.Cleanup on TestChannelStore that purges the affected tables entirely. A blanket purge is safe: the schema enforces no FK constraints, and every test suite creates its own data independently. * Fix command injection in server-test-template workflow (#36080) Cherry-pick of9223935f16from master. * fix(ci): restore testname format in sharded gotestsum runs (#36078) run-shard-tests.sh called gotestsum directly without --format, so it fell back to gotestsum's default (pkgname) instead of the testname format set by the Makefile. Pass --format "${GOTESTSUM_FORMAT:-testname}" to match the Makefile default. Co-authored-by: Mattermost Build <[email protected]> * fixup: drop demo_plugin playwright specs — master-only APIs demo_plugin/helpers.ts and demo_plugin_installation.spec.ts use installAndEnablePlugin and isPluginActive which don't exist on release-11.4's PlaywrightExtended type. These files were re-created by the step-11 cherry-pick of39f1979aa5, but they don't compile on this branch (same class of problem as actions.spec.ts in step 10). * fixup: add missing await in PluginLinkTooltip test The test added in39f1979aa5is missing an await on renderWithContext, causing the pointer-events assertion to race. Fix from 0c7d3f27c6 (on a feature branch, not yet on master). * fixup: drop pointer-events test incompatible with jsdom@20 The 'should not block interaction with elements outside the tooltip' test checks getComputedStyle for pointer-events: none, which is set only in SCSS. release-11.4 uses jest-environment-jsdom@29 (jsdom@20), which does not apply stylesheets, so getComputedStyle always returns "". The test passes on release-11.5+ only because they use jest-environment-jsdom@30 (jsdom@25+). Drop the test rather than backport the jsdom upgrade. * fixup: add missing i18n keys for elasticsearch/opensearch functions BackfillPostsChannelType and UpdatePostsChannelTypeByChannelId exist on release-11.4 (unlike release-11.5+). The golangci-lint cherry-pick added new error strings to those functions referencing i18n keys that weren't in en.json. * fixup: run make i18n-extract to reorder keys correctly * fixup: drop terms-and-privacy checkbox from MM-T1774 on release-11.4 The #signup-body-card-form-check-terms-and-privacy element did not exist on release-11.4's signup page. It was added to master after this branch was cut, so the check() call from the incoming cherry-pick causes the test to fail with "element never found". * fixup: remove UpdatePostsChannelTypeByChannelId/BackfillPostsChannelType These functions were introduced by MM-67540 (allow searching public channel messages without channel membership), which never landed on release-11.4. The golangci-lint cherry-pick only modernizes existing code; the rerere resolution incorrectly added the full function bodies from master. Remove both functions and their now-unused imports (fmt, updatebyquery, scriptlanguage) from elasticsearch.go and opensearch.go. Also remove the two i18n keys added to support them. Same treatment as release-11.5, where these functions were also absent. --------- Co-authored-by: Mattermost Build <[email protected]>
117 lines
3.7 KiB
Bash
Executable File
117 lines
3.7 KiB
Bash
Executable File
#!/bin/bash
|
|
set -uo pipefail
|
|
|
|
# run-shard-tests.sh — Multi-run test wrapper for sharded CI
|
|
#
|
|
# When a shard has both "light" packages (run whole) and "heavy" package
|
|
# splits (run with -run regex), we need multiple gotestsum invocations.
|
|
# The Makefile's test-server target only supports a single invocation,
|
|
# so this script calls gotestsum directly.
|
|
#
|
|
# Each invocation produces its own JUnit XML and JSON log files, which
|
|
# are merged at the end into the standard report.xml and gotestsum.json
|
|
# that the CI pipeline expects.
|
|
#
|
|
# Input files (in working directory, written by shard-split.js):
|
|
# shard-te-packages.txt — space-separated TE packages
|
|
# shard-ee-packages.txt — space-separated EE packages
|
|
# shard-heavy-runs.txt — one line per heavy run: "pkg REGEX"
|
|
#
|
|
# Environment variables (set by CI):
|
|
# RACE_MODE — "-race" on master, empty on PRs
|
|
# ENABLE_COVERAGE — "true" to enable coverage profiling
|
|
|
|
GOBIN="$(pwd)/bin"
|
|
|
|
# Set up build prerequisites (go.work, gotestsum, go versions)
|
|
# These are normally done by make test-server-pre.
|
|
make setup-go-work gotestsum golang-versions
|
|
|
|
GOFLAGS_BASE="-buildvcs=false -timeout=90m"
|
|
RACE_FLAG="${RACE_MODE:-}"
|
|
|
|
RUN_IDX=0
|
|
FAILURES=0
|
|
|
|
# run_gotestsum PACKAGES [RUN_REGEX]
|
|
# $1 = space-separated package list
|
|
# $2 = optional -run regex (passed directly to go test)
|
|
run_gotestsum() {
|
|
local junitfile="report-${RUN_IDX}.xml"
|
|
local jsonfile="gotestsum-${RUN_IDX}.json"
|
|
local run_flag=""
|
|
if [[ -n "${2:-}" ]]; then run_flag="-run $2"; fi
|
|
|
|
local coverage_flag=""
|
|
if [[ "${ENABLE_COVERAGE:-false}" == "true" ]]; then
|
|
coverage_flag="-coverprofile=cover-${RUN_IDX}.out -covermode=atomic"
|
|
fi
|
|
|
|
RUN_IDX=$((RUN_IDX + 1))
|
|
|
|
GOTESTSUM_JUNITFILE="$junitfile" GOTESTSUM_JSONFILE="$jsonfile" \
|
|
"$GOBIN/gotestsum" --format "${GOTESTSUM_FORMAT:-testname}" --rerun-fails=3 --packages="$1" \
|
|
-- $GOFLAGS_BASE $RACE_FLAG $coverage_flag $run_flag \
|
|
|| FAILURES=$((FAILURES + 1))
|
|
}
|
|
|
|
# ── Read shard assignments ──
|
|
SHARD_TE=""
|
|
SHARD_EE=""
|
|
HEAVY_RUNS=""
|
|
|
|
if [[ -f shard-te-packages.txt ]]; then
|
|
SHARD_TE=$(cat shard-te-packages.txt)
|
|
fi
|
|
if [[ -f shard-ee-packages.txt ]]; then
|
|
SHARD_EE=$(cat shard-ee-packages.txt)
|
|
fi
|
|
if [[ -f shard-heavy-runs.txt && -s shard-heavy-runs.txt ]]; then
|
|
HEAVY_RUNS=$(cat shard-heavy-runs.txt)
|
|
fi
|
|
|
|
# ── Run light packages (single invocation, no -run filter) ──
|
|
ALL_LIGHT="${SHARD_TE} ${SHARD_EE}"
|
|
ALL_LIGHT="${ALL_LIGHT## }"
|
|
ALL_LIGHT="${ALL_LIGHT%% }"
|
|
if [[ -n "$ALL_LIGHT" ]]; then
|
|
LIGHT_COUNT=$(echo "$ALL_LIGHT" | wc -w)
|
|
echo "Running $LIGHT_COUNT light packages..."
|
|
run_gotestsum "$ALL_LIGHT"
|
|
fi
|
|
|
|
# ── Run heavy package splits (one invocation per package subset) ──
|
|
if [[ -n "$HEAVY_RUNS" ]]; then
|
|
while IFS= read -r line; do
|
|
[[ -z "$line" ]] && continue
|
|
PKG="${line%% *}"
|
|
REGEX="${line#* }"
|
|
SHORT_PKG="${PKG##*/}"
|
|
TEST_COUNT=$(echo "$REGEX" | tr '|' '\n' | wc -l)
|
|
echo "Running $TEST_COUNT tests from $SHORT_PKG..."
|
|
run_gotestsum "$PKG" "$REGEX"
|
|
done <<< "$HEAVY_RUNS"
|
|
fi
|
|
|
|
# ── Merge results from all runs ──
|
|
echo "Merging results from $RUN_IDX gotestsum runs..."
|
|
|
|
if ls report-*.xml 1>/dev/null 2>&1; then
|
|
# Simple XML concatenation — the merge job uses junit-report-merger for proper merging
|
|
head -1 report-0.xml > report.xml
|
|
echo "<testsuites>" >> report.xml
|
|
for f in report-*.xml; do
|
|
grep -v "<?xml" "$f" | grep -v "^<testsuites" | grep -v "^</testsuites" >> report.xml || true
|
|
done
|
|
echo "</testsuites>" >> report.xml
|
|
fi
|
|
|
|
cat gotestsum-*.json > gotestsum.json 2>/dev/null || true
|
|
|
|
if [[ $FAILURES -gt 0 ]]; then
|
|
echo "Shard complete: $RUN_IDX gotestsum runs, $FAILURES failed"
|
|
exit 1
|
|
fi
|
|
|
|
echo "Shard complete: $RUN_IDX gotestsum runs, all passed"
|