From 216fd671844d36340ab5c7c6f79dd1568aec2d98 Mon Sep 17 00:00:00 2001 From: John Coffey Date: Fri, 20 Nov 2026 10:57:18 -0700 Subject: [PATCH 1/4] webmail-restart-test.sh: RESTART names what to restart under the tabs --- lab/chart/webmail-restart-test.sh | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/lab/chart/webmail-restart-test.sh b/lab/chart/webmail-restart-test.sh index 7f581d0..46768b5 100755 --- a/lab/chart/webmail-restart-test.sh +++ b/lab/chart/webmail-restart-test.sh @@ -16,6 +16,12 @@ # # WEBMAIL_IMAGE (a local image loaded into kind) installs that webmail # first, with values-frontends.yaml; otherwise the installed one is tested. +# +# RESTART names the Deployments restarted under the tabs, one after +# another (default inbuxa-webmail), so the same check covers the server's +# groups the webmail talks to: +# +# RESTART="inbuxa-front inbuxa-core" lab/chart/webmail-restart-test.sh set -euo pipefail cd "$(dirname "$0")" @@ -75,11 +81,14 @@ if [ "$("${K[@]}" -n lab-sink get pod webmail-tabs -o jsonpath='{.status.phase}' fail "the tabs stopped before the restart" fi -image="$("${K[@]}" -n inbuxa get deploy inbuxa-webmail -o jsonpath='{.spec.template.spec.containers[0].image}')" -echo "== restarting the webmail ($image) under them" -"${K[@]}" -n inbuxa rollout restart deploy/inbuxa-webmail >/dev/null -"${K[@]}" -n inbuxa rollout status deploy/inbuxa-webmail --timeout=5m >/dev/null -sleep 20 +for d in ${RESTART:-inbuxa-webmail}; do + image="$("${K[@]}" -n inbuxa get deploy "$d" -o jsonpath='{.spec.template.spec.containers[0].image}')" + echo "== restarting $d ($image) under them" + "${K[@]}" -n inbuxa rollout restart "deploy/$d" >/dev/null + "${K[@]}" -n inbuxa rollout status "deploy/$d" --timeout=5m >/dev/null + # rollout status returns before the old pods have finished going + sleep 20 +done "${K[@]}" -n lab-sink exec webmail-tabs -- touch /tmp/stop "${K[@]}" -n lab-sink wait --for=jsonpath='{.status.phase}'=Succeeded pod/webmail-tabs --timeout=120s >/dev/null \ -- 2.54.0 From bdd04388c4c1afb8b602b5eeb1237d525815b284 Mon Sep 17 00:00:00 2001 From: John Coffey Date: Fri, 20 Nov 2026 10:57:18 -0700 Subject: [PATCH 2/4] probe (to be reverted): which restart fails a webmail request --- .github/workflows/e2e.yml | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index eea11d4..cdc764b 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -69,6 +69,7 @@ jobs: e2e: needs: matrix + if: false name: e2e (${{ matrix.kubernetes.minor }}, ${{ matrix.runner }}) strategy: fail-fast: false @@ -116,7 +117,7 @@ jobs: # architectures. chaos: needs: matrix - if: ${{ inputs.chart_ref == '' }} + if: false name: chaos (${{ fromJSON(needs.matrix.outputs.newest).minor }}, ${{ matrix.runner }}) strategy: fail-fast: false @@ -153,7 +154,7 @@ jobs: # both architectures. gitops: needs: matrix - if: ${{ inputs.chart_ref == '' }} + if: false name: gitops (${{ matrix.tool }}, ${{ fromJSON(needs.matrix.outputs.newest).minor }}, ${{ matrix.runner }}) strategy: fail-fast: false @@ -199,3 +200,34 @@ jobs: fi kubectl -n inbuxa get jobs,pods -o wide || true kubectl -n inbuxa logs job/inbuxa-upgrade --tail=40 || true + + probe: + needs: matrix + runs-on: ubuntu-24.04 + timeout-minutes: 75 + steps: + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + with: + repository: inbuxa/inbuxa-k8s-lab + ref: ${{ github.sha }} + path: inbuxa-k8s-lab + persist-credentials: false + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + with: + repository: inbuxa/inbuxa-charts + ref: main + path: inbuxa-charts + persist-credentials: false + - run: | + inbuxa-k8s-lab/lab/tools.sh "$HOME/.local/bin" + echo "$HOME/.local/bin" >> "$GITHUB_PATH" + - env: + KIND_NODE_IMAGE: ${{ fromJSON(needs.matrix.outputs.newest).image }} + run: inbuxa-k8s-lab/lab/e2e.sh + - run: | + for d in inbuxa-front inbuxa-core inbuxa-mta inbuxa-console inbuxa-webmail; do + for i in 1 2 3; do + echo "##### $d try $i" + RESTART=$d inbuxa-k8s-lab/lab/chart/webmail-restart-test.sh || echo "##### FAILED $d try $i" + done + done -- 2.54.0 From 8e1c7b0dbaff47928755e82a2cceb1860fb43f8e Mon Sep 17 00:00:00 2001 From: John Coffey Date: Fri, 20 Nov 2026 11:18:31 -0700 Subject: [PATCH 3/4] Revert "probe (to be reverted): which restart fails a webmail request" This reverts commit bdd04388c4c1afb8b602b5eeb1237d525815b284. --- .github/workflows/e2e.yml | 36 ++---------------------------------- 1 file changed, 2 insertions(+), 34 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index cdc764b..eea11d4 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -69,7 +69,6 @@ jobs: e2e: needs: matrix - if: false name: e2e (${{ matrix.kubernetes.minor }}, ${{ matrix.runner }}) strategy: fail-fast: false @@ -117,7 +116,7 @@ jobs: # architectures. chaos: needs: matrix - if: false + if: ${{ inputs.chart_ref == '' }} name: chaos (${{ fromJSON(needs.matrix.outputs.newest).minor }}, ${{ matrix.runner }}) strategy: fail-fast: false @@ -154,7 +153,7 @@ jobs: # both architectures. gitops: needs: matrix - if: false + if: ${{ inputs.chart_ref == '' }} name: gitops (${{ matrix.tool }}, ${{ fromJSON(needs.matrix.outputs.newest).minor }}, ${{ matrix.runner }}) strategy: fail-fast: false @@ -200,34 +199,3 @@ jobs: fi kubectl -n inbuxa get jobs,pods -o wide || true kubectl -n inbuxa logs job/inbuxa-upgrade --tail=40 || true - - probe: - needs: matrix - runs-on: ubuntu-24.04 - timeout-minutes: 75 - steps: - - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - with: - repository: inbuxa/inbuxa-k8s-lab - ref: ${{ github.sha }} - path: inbuxa-k8s-lab - persist-credentials: false - - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - with: - repository: inbuxa/inbuxa-charts - ref: main - path: inbuxa-charts - persist-credentials: false - - run: | - inbuxa-k8s-lab/lab/tools.sh "$HOME/.local/bin" - echo "$HOME/.local/bin" >> "$GITHUB_PATH" - - env: - KIND_NODE_IMAGE: ${{ fromJSON(needs.matrix.outputs.newest).image }} - run: inbuxa-k8s-lab/lab/e2e.sh - - run: | - for d in inbuxa-front inbuxa-core inbuxa-mta inbuxa-console inbuxa-webmail; do - for i in 1 2 3; do - echo "##### $d try $i" - RESTART=$d inbuxa-k8s-lab/lab/chart/webmail-restart-test.sh || echo "##### FAILED $d try $i" - done - done -- 2.54.0 From 5ea9893544899d4b1fa8eba4116b2b01efe28d84 Mon Sep 17 00:00:00 2001 From: John Coffey Date: Fri, 20 Nov 2026 11:18:35 -0700 Subject: [PATCH 4/4] webmail-restart-test.sh: streams must come back only when the webmail restarts --- README.md | 2 ++ lab/chart/webmail-restart-test.sh | 11 ++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ac9935c..4b5cbef 100644 --- a/README.md +++ b/README.md @@ -61,6 +61,8 @@ nightly, on the newest minor and both architectures. `lab/chart/webmail-restart-test.sh` restarts the webmail under open tabs and checks no request failed and every live-update stream came back. +`RESTART=` names other Deployments to restart under them instead, such as +the server's groups or the console. `lab/soak/soak.sh start` is the soak: a week (`SOAK_DAYS`) of steady load on an installed chart, with a different chaos scenario each day. Mail in diff --git a/lab/chart/webmail-restart-test.sh b/lab/chart/webmail-restart-test.sh index 46768b5..249ad23 100755 --- a/lab/chart/webmail-restart-test.sh +++ b/lab/chart/webmail-restart-test.sh @@ -94,16 +94,21 @@ done "${K[@]}" -n lab-sink wait --for=jsonpath='{.status.phase}'=Succeeded pod/webmail-tabs --timeout=120s >/dev/null \ || fail "the tabs didn't finish" out="$("${K[@]}" -n lab-sink logs webmail-tabs | tail -1)" -python3 - "$out" <<'PY' +python3 - "$out" "${RESTART:-inbuxa-webmail}" <<'PY' import json, sys r = json.loads(sys.argv[1]) +# Streams end only when the webmail itself restarts; the server's groups +# and the console sit behind it, so there the streams just stay open +webmail = "inbuxa-webmail" in sys.argv[2].split() print(f" requests: {r['requests']} made, {r['failed']} failed") for i, t in enumerate(r["tabs"]): print(f" tab {i}: {t['streams']} streams, {t['clean_ends']} ended cleanly, {t['cut_off']} cut off, " f"longest wait for an event {t['longest_gap_s']} s") for e in r["errors"]: print(f" {e}") -bad = r["failed"] > 0 or any(t["cut_off"] > 0 or t["streams"] < 2 for t in r["tabs"]) -print("== " + ("FAIL: a tab would have shown an error" if bad else "no request failed; every stream ended cleanly and came back")) +bad = r["failed"] > 0 or any(t["cut_off"] > 0 or (webmail and t["streams"] < 2) for t in r["tabs"]) +print("== " + ("FAIL: a tab would have shown an error" if bad else + "no request failed; every stream ended cleanly and came back" if webmail else + "no request failed; no stream cut off")) sys.exit(1 if bad else 0) PY -- 2.54.0