From 7c88abcbc7e1c2f028bb287d31e618a1e7baf21d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hern=C3=A2ni=20Marques?= Date: Fri, 17 Jul 2026 19:09:37 +0200 Subject: [PATCH] monitoring: default e2e (withdraw+pay) for stage lefrancpaysan -d stage.lefrancpaysan.ch / TESTPAYSAN runs urls+e2e by default. --- scripts/taler-monitoring/README.md | 6 +++++- scripts/taler-monitoring/secrets.env.example | 8 ++++++++ scripts/taler-monitoring/taler-monitoring.sh | 14 +++++++++++--- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/scripts/taler-monitoring/README.md b/scripts/taler-monitoring/README.md index 9d5422f..4771c6a 100644 --- a/scripts/taler-monitoring/README.md +++ b/scripts/taler-monitoring/README.md @@ -81,8 +81,12 @@ Each check prints **global** and **grouped** ids: ./taler-monitoring.sh sanity ./taler-monitoring.sh e2e +# FrancPaysan STAGE (TESTPAYSAN) — default: urls + e2e (withdraw + pay templates) +./taler-monitoring.sh -d stage.lefrancpaysan.ch +# Admin credit: E2E_BANK_ADMIN_PASS=… or SSH francpaysan-host secrets +# (bank-admin-password.txt under /mnt/data/stagepaysan/bank/secrets/) -# Other domains — public HTTPS only, never SSH +# Other domains — public HTTPS only, never SSH (pass e2e explicitly) ./taler-monitoring.sh -d taler.net ./taler-monitoring.sh --domain taler-ops.ch ./taler-monitoring.sh -d my.taler-ops.ch urls diff --git a/scripts/taler-monitoring/secrets.env.example b/scripts/taler-monitoring/secrets.env.example index 2af0ffc..f7e13de 100644 --- a/scripts/taler-monitoring/secrets.env.example +++ b/scripts/taler-monitoring/secrets.env.example @@ -26,6 +26,14 @@ # MERCHANT_TOKEN= # MERCHANT_INSTANCE_PASSWORD= +# --- FrancPaysan STAGE (TESTPAYSAN) e2e --- +# Default phases for -d stage.lefrancpaysan.ch: urls + e2e +# Admin credit (required for ATM withdraw ladder on stage): +# E2E_BANK_ADMIN_PASS=… # or auto-load via SSH francpaysan-host +# FRANCPAYSAN_SSH=francpaysan-host +# FRANCPAYSAN_SECRETS=$HOME/francpaysan-secrets +# Public shop pays use E2E_USE_TEMPLATES=1 (default on TESTPAYSAN) — no merchant token. + # Optional overrides # MERCHANT_INSTANCE=goa-demo-cp4zqk # EXPECT_CURRENCY=GOA diff --git a/scripts/taler-monitoring/taler-monitoring.sh b/scripts/taler-monitoring/taler-monitoring.sh index 75d07e9..05e6f5d 100755 --- a/scripts/taler-monitoring/taler-monitoring.sh +++ b/scripts/taler-monitoring/taler-monitoring.sh @@ -152,7 +152,7 @@ export TALER_DOMAIN BANK_PUBLIC EXCHANGE_PUBLIC MERCHANT_PUBLIC export EXPECT_CURRENCY SKIP_SSH LOCAL_STACK TALER_DOMAIN_PROBE CHECK_LANDING export WITHDRAW_AMT PAY_AMT CREDIT_AMT MERCHANT_INSTANCE export E2E_FAKE_INCOMING E2E_REMOTE E2E_VARIABLE E2E_ATM_MAX -export E2E_WITHDRAW_VALUES E2E_PAY_VALUES +export E2E_WITHDRAW_VALUES E2E_PAY_VALUES E2E_USE_TEMPLATES E2E_TEMPLATE_MAP export PAIVANA_PUBLIC E2E_PAIVANA E2E_PAIVANA_TEMPLATE E2E_PAIVANA_AMOUNT E2E_PAIVANA_INSTANCE # Ladder: withdraw then pay — 0 + random mids + max-1 + max (see check_goa_ladder.sh). # Defaults so set -u export is safe when vars were never set by caller. @@ -181,11 +181,19 @@ export LADDER_PAY LADDER_WITHDRAW_SCALE LADDER_PAY_SETTLE_ROUNDS export TALER_DOMAIN_APPLIED=1 # Default phases +# - local GOA (koopa): urls + SSH phases + e2e +# - FrancPaysan STAGE (TESTPAYSAN / stage.*lefrancpaysan*): urls + e2e +# (public withdraw + template pay — no SSH) +# - other remote: urls only (pass "e2e" explicitly) if [ "${#PHASES[@]}" -eq 0 ]; then if [ "${LOCAL_STACK}" = "1" ]; then - PHASES=(urls inside versions e2e) # koopa: SSH ok + PHASES=(urls inside versions e2e) + elif [ "${EXPECT_CURRENCY:-}" = "TESTPAYSAN" ] \ + || [[ "${TALER_DOMAIN:-}" == stage.*lefrancpaysan* ]] \ + || [[ "${TALER_DOMAIN:-}" == *stage.lefrancpaysan* ]]; then + PHASES=(urls e2e) else - PHASES=(urls) # remote default: public only; pass "e2e" to try + PHASES=(urls) fi fi