完成a6000测试系统构建、部署、测试整合 #35

Merged
yuyr merged 18 commits from dev_1.0.0_yuyr_5 into dev_1.0.0 2025-10-29 10:04:29 +08:00
3 changed files with 44 additions and 4 deletions
Showing only changes of commit 9b9fade833 - Show all commits

View File

@ -4,6 +4,7 @@ set -euo pipefail
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
ENABLE_GPU=false ENABLE_GPU=false
CLEANUP=true
usage() { usage() {
cat <<'EOF' cat <<'EOF'
@ -11,6 +12,7 @@ Usage: 00_e2e_test.sh [options]
Options: Options:
--enable-gpu 启用 GPU 相关拓扑与测试流程 --enable-gpu 启用 GPU 相关拓扑与测试流程
--no-clean 跳过清理流程(不执行 14 和 09
-h, --help 显示帮助信息 -h, --help 显示帮助信息
EOF EOF
} }
@ -21,6 +23,10 @@ while [[ $# -gt 0 ]]; do
ENABLE_GPU=true ENABLE_GPU=true
shift shift
;; ;;
--no-clean)
CLEANUP=false
shift
;;
-h|--help) -h|--help)
usage usage
exit 0 exit 0
@ -35,6 +41,7 @@ done
export ARGUS_SYS_ENABLE_GPU=$ENABLE_GPU export ARGUS_SYS_ENABLE_GPU=$ENABLE_GPU
# 基础步骤(不包含清理与下线)
SCRIPTS=( SCRIPTS=(
"01_bootstrap.sh" "01_bootstrap.sh"
"02_up.sh" "02_up.sh"
@ -48,9 +55,15 @@ SCRIPTS=(
"11_metric_node_install.sh" "11_metric_node_install.sh"
"12_metric_gpu_install.sh" "12_metric_gpu_install.sh"
"13_metric_verify.sh" "13_metric_verify.sh"
)
# 如未禁用清理,则追加清理与下线步骤(保持原有顺序)
if [[ "$CLEANUP" == "true" ]]; then
SCRIPTS+=(
"14_metric_cleanup.sh" "14_metric_cleanup.sh"
"09_down.sh" "09_down.sh"
) )
fi
for script in "${SCRIPTS[@]}"; do for script in "${SCRIPTS[@]}"; do
echo "[SYS-E2E] Running $script" echo "[SYS-E2E] Running $script"
@ -59,4 +72,8 @@ for script in "${SCRIPTS[@]}"; do
echo echo
done done
echo "[SYS-E2E] All tests completed" if [[ "$CLEANUP" == "true" ]]; then
echo "[SYS-E2E] All tests completed"
else
echo "[SYS-E2E] All tests completed (cleanup skipped)"
fi

View File

@ -43,6 +43,29 @@ fi
pushd "$PLUGIN_DIR" >/dev/null pushd "$PLUGIN_DIR" >/dev/null
# --- Inject agent binary built in 01_bootstrap (if present) ---
AGENT_PATH_FILE="$TEST_ROOT/tmp/agent_binary_path"
AGENT_BIN_CANDIDATE="$REPO_ROOT/src/agent/dist/argus-agent"
if [[ -f "$AGENT_PATH_FILE" ]]; then
AGENT_BIN="$(tr -d '\n' < "$AGENT_PATH_FILE")"
else
AGENT_BIN="$AGENT_BIN_CANDIDATE"
fi
if [[ -x "$AGENT_BIN" ]]; then
echo "[SYS-METRIC] 使用 01 阶段构建的 agent: $AGENT_BIN"
TARGET_BIN="plugins/argus-agent/bin/argus-agent"
if [[ -f "$TARGET_BIN" ]]; then
cp -f "$AGENT_BIN" "$TARGET_BIN"
else
mkdir -p "$(dirname "$TARGET_BIN")"
cp "$AGENT_BIN" "$TARGET_BIN"
fi
chmod +x "$TARGET_BIN"
else
echo "[SYS-METRIC] 未找到可执行的 agent 二进制(预期: $AGENT_BIN),继续使用插件目录内置版本"
fi
echo "[SYS-METRIC] Bumping metric artifact version..." echo "[SYS-METRIC] Bumping metric artifact version..."
bash scripts/version-manager.sh bump minor bash scripts/version-manager.sh bump minor

View File

@ -71,7 +71,7 @@ export function NodeTable({
size="xs" size="xs"
variant="outline" variant="outline"
component="a" component="a"
href={`${EXTERNAL_HOST.GRAFANA}/d/node_gpu_metrics/node-and-gpu-metrics?var-hostname=${encodeURIComponent(node.name)}`} href={`${EXTERNAL_HOST.GRAFANA}/d/node_gpu_metrics_by_hostname/node-and-gpu-metrics-by-hostname?var-hostname=${encodeURIComponent(node.name)}`}
target="_blank" target="_blank"
rel="noopener noreferrer" rel="noopener noreferrer"
> >