diff --git a/src/agent/tests/scripts/06_restart_agent_and_reregister.sh b/src/agent/tests/scripts/06_restart_agent_and_reregister.sh index 830f573..78c6322 100755 --- a/src/agent/tests/scripts/06_restart_agent_and_reregister.sh +++ b/src/agent/tests/scripts/06_restart_agent_and_reregister.sh @@ -10,6 +10,7 @@ AGENT_HOSTNAME="dev-e2euser-e2einst-pod-0" NETWORK_NAME="tests_default" NEW_AGENT_IP="172.28.0.200" ENTRYPOINT_SCRIPT="$SCRIPT_DIR/agent_entrypoint.sh" +ENV_FILE="$TEST_ROOT/.env" # 中文提示:重启场景也需要同样的入口脚本,确保 DNS 注册逻辑一致 if [[ ! -f "$ENTRYPOINT_SCRIPT" ]]; then @@ -28,6 +29,21 @@ if [[ ! -x "$AGENT_BINARY" ]]; then exit 1 fi +if [[ -f "$ENV_FILE" ]]; then + set -a + # shellcheck disable=SC1090 + source "$ENV_FILE" + set +a +else + REPO_ROOT="$(cd "$TEST_ROOT/../../.." && pwd)" + # shellcheck disable=SC1090 + source "$REPO_ROOT/scripts/common/build_user.sh" + load_build_user +fi + +AGENT_UID="${ARGUS_BUILD_UID:-2133}" +AGENT_GID="${ARGUS_BUILD_GID:-2015}" + compose() { if docker compose version >/dev/null 2>&1; then docker compose "$@" @@ -80,6 +96,8 @@ if ! docker run -d \ -v "$ENTRYPOINT_SCRIPT:/usr/local/bin/agent-entrypoint.sh:ro" \ -e MASTER_ENDPOINT=http://master.argus.com:3000 \ -e REPORT_INTERVAL_SECONDS=2 \ + -e ARGUS_BUILD_UID="$AGENT_UID" \ + -e ARGUS_BUILD_GID="$AGENT_GID" \ --entrypoint /usr/local/bin/agent-entrypoint.sh \ ubuntu:22.04 >/dev/null; then echo "[ERROR] Failed to start agent container with custom IP" >&2