chore: 对齐 00-05 §2 的部署与验证脚本
- 新增 deploy-lab.sh(k3s/longhorn/nginx 铺栈)与 ssh/run-phase2-k3s-on-ylc61-as-jack.sh - verify.sh:flow/preflight、VERIFY_TEARDOWN 默认、注释与 §2 对应 - 更新 smoke-verify、README、.env.verify.example、根 README 与主要 playbook 头注释 - k3s-delete-lab-stacks 标明重度清场语义 Made-with: Cursor
This commit is contained in:
25
scripts/ssh/run-phase2-k3s-on-ylc61-as-jack.sh
Normal file
25
scripts/ssh/run-phase2-k3s-on-ylc61-as-jack.sh
Normal file
@@ -0,0 +1,25 @@
|
||||
#!/usr/bin/env bash
|
||||
# 在办公机执行:经 SSH 在控制节点 ylc61 上跑「K3s 安装/复验」部署流水线。
|
||||
# 对应 docs/00-05 §2 步骤 1(接入)+ 3(部署)中的 k3s 路径;与 verify.sh 矩阵验收分离。
|
||||
#
|
||||
# 依赖:本机可 ssh ylc61(BatchMode);远端仓库路径存在且含 scripts/deploy-lab.sh。
|
||||
set -euo pipefail
|
||||
|
||||
REMOTE_ROOT="${LAB_REPO_ROOT:-/home/jack/实验室建设}"
|
||||
# 将当前 shell 中的 K3S_PREPARE_STORAGE 传到远端(未设置则默认 false)
|
||||
KS_PREP="${K3S_PREPARE_STORAGE:-false}"
|
||||
|
||||
exec ssh -o BatchMode=yes ylc61 bash -lc "
|
||||
set -euo pipefail
|
||||
cd '${REMOTE_ROOT}'
|
||||
chmod +x scripts/deploy-lab.sh 2>/dev/null || true
|
||||
if [[ -f scripts/.env.verify ]]; then
|
||||
set -a
|
||||
# shellcheck disable=SC1091
|
||||
source scripts/.env.verify
|
||||
set +a
|
||||
fi
|
||||
# 办公机传入的 K3S_PREPARE_STORAGE 覆盖远端 .env 中的默认
|
||||
export K3S_PREPARE_STORAGE='${KS_PREP}'
|
||||
./scripts/deploy-lab.sh k3s
|
||||
"
|
||||
@@ -1,6 +1,35 @@
|
||||
#!/usr/bin/env bash
|
||||
# 从办公机 Git Bash 执行:经 ssh 在 ylc61 上 smoke 跑样板 doc_id。
|
||||
# 从办公机 Git Bash 执行:SSH 到 ylc61 上跑若干样板 verify(对应 docs/00-05 §2 步骤 4~6 的抽样)。
|
||||
# 步骤 1~3 需已满足:远端仓库路径正确、已 deploy K3s、可选 scripts/.env.verify。
|
||||
#
|
||||
# 环境变量:
|
||||
# VERIFY_REPO_ROOT 远端仓库根目录(默认 /home/jack/实验室建设)
|
||||
# VERIFY_TEARDOWN / nginx_entry_base / nodejs_entry_base 传给远端 verify.sh
|
||||
set -euo pipefail
|
||||
|
||||
exec ssh -o BatchMode=yes ylc61 'bash -lc "cd /home/jack && chmod +x scripts/verify.sh && export VERIFY_TEARDOWN=${VERIFY_TEARDOWN:-1} && export nginx_entry_base=${nginx_entry_base:-http://192.168.2.61} && export nodejs_entry_base=${nodejs_entry_base:-http://192.168.2.61} && ./scripts/verify.sh run 02-05 && ./scripts/verify.sh run 03-05 && ./scripts/verify.sh run 03-07 && ./scripts/verify.sh run 04-01"'
|
||||
REMOTE_ROOT="${VERIFY_REPO_ROOT:-/home/jack/实验室建设}"
|
||||
TEARDOWN="${VERIFY_TEARDOWN:-1}"
|
||||
NGX="${nginx_entry_base:-http://192.168.2.61}"
|
||||
NODE="${nodejs_entry_base:-http://192.168.2.61}"
|
||||
|
||||
exec ssh -o BatchMode=yes ylc61 bash -lc "
|
||||
set -euo pipefail
|
||||
cd '${REMOTE_ROOT}'
|
||||
chmod +x scripts/verify.sh 2>/dev/null || true
|
||||
export VERIFY_TEARDOWN='${TEARDOWN}'
|
||||
export nginx_entry_base='${NGX}'
|
||||
export nodejs_entry_base='${NODE}'
|
||||
if [[ -f scripts/.env.verify ]]; then
|
||||
set -a
|
||||
# shellcheck disable=SC1091
|
||||
source scripts/.env.verify
|
||||
set +a
|
||||
fi
|
||||
export VERIFY_TEARDOWN='${TEARDOWN}'
|
||||
export nginx_entry_base='${NGX}'
|
||||
export nodejs_entry_base='${NODE}'
|
||||
./scripts/verify.sh run 02-05
|
||||
./scripts/verify.sh run 03-05
|
||||
./scripts/verify.sh run 03-07
|
||||
./scripts/verify.sh run 04-01
|
||||
"
|
||||
|
||||
Reference in New Issue
Block a user