Skip to content

E
epm-docker-test
Commit f88ade56 authored by Ivan Mazhukin's avatar Ivan Mazhukin
Browse files
Options

less output when use --exec command

parent 5e065f15
Hide whitespace changes
Inline Side-by-side
Showing with 149 additions and 36 deletions
README.md
View file @ f88ade56
......@@ -115,7 +115,7 @@
- `--builder-path <path>`: явный builder64-путь вместо дефолта
- `--preset <all|russian|main>`: добавить набор систем
- `--latest`: передать `--latest` в `epm play` (принудительно последняя версия)
- `--exec <cmd>`: выполнить произвольную shell-команду вместо `epm play` (bootstrap системы выполняется как обычно)
- `--exec <cmd>`: выполнить произвольную shell-команду вместо `epm play` без bootstrap системы
- `--parallel`: запустить все тесты параллельно
- `-j <N>`: запустить не более N тестов одновременно
- `--log-root <path>`: каталог для логов
......@@ -209,7 +209,7 @@ Runner: local docker (inside ssh session, user: builder-robot)
## Что делает контейнер
Внутри контейнера скрипт:
В режиме `play` внутри контейнера скрипт:
1. Определяет `os_id` из `/etc/os-release`.
2. Проверяет наличие `bin/eepm` в примонтированной директории.
......@@ -220,7 +220,9 @@ Runner: local docker (inside ssh session, user: builder-robot)
./bin/eepm play --auto <app>
```
Сейчас bootstrap завязан на семейство системы:
В режиме `--exec` bootstrap пропускается: команда запускается через `sh -c` сразу после подготовки временного `HOME`. Если доступно дерево `eepm`, его `bin` добавляется в `PATH`.
Сейчас bootstrap для `play` завязан на семейство системы:
- `altlinux|alt`: `repo set etersoft`, `update`, затем установка `wget glibc-pthread file`
- `debian|ubuntu`: `update`, затем установка `wget ca-certificates coreutils file`
......
epm-docker-test.sh
View file @ f88ade56
......@@ -30,6 +30,7 @@ SYSTEM_INPUTS=()
PRESET_NAMES=()
TARGET_SYSTEMS=()
PARALLEL_JOBS=0
EFFECTIVE_RUN_MODE=""
SUMMARY_SYSTEMS=()
SUMMARY_RESULTS=()
SUMMARY_LOGS=()
......@@ -294,6 +295,29 @@ resolve_source_path() {
esac
}
resolve_exec_source_path() {
local candidate
case "$SOURCE_KIND" in
local|explicit)
candidate="${SOURCE_PATH:-$(pwd -P)}"
;;
builder64)
candidate="${BUILDER_PATH:-$(default_builder_source_path)}"
;;
*)
fatal "Unsupported eepm source kind: $SOURCE_KIND"
;;
esac
[[ -n "$candidate" ]] || return 0
candidate="$(realpath "$candidate" 2>/dev/null || printf '%s\n' "$candidate")"
if [[ -d "$candidate" && -f "$candidate/bin/eepm" && -r "$candidate/bin/eepm" ]]; then
printf '%s\n' "$candidate"
fi
}
remote_target() {
[[ -n "$REMOTE_USER" ]] || fatal "Remote user is empty"
printf '%s@%s\n' "$REMOTE_USER" "$REMOTE_HOST"
......@@ -410,6 +434,7 @@ print_summary_table() {
local result_label
local result_output
[[ -z "$EXEC_COMMAND" ]] || return 0
((${#SUMMARY_SYSTEMS[@]} > 1)) || return 0
for i in "${!SUMMARY_SYSTEMS[@]}"; do
......@@ -480,6 +505,7 @@ set -eu
TEST_COMMAND="$1"
shift
SOURCE_DIR="/work/eepm"
HAS_SOURCE=0
run_eepm() {
bash ./bin/eepm "$@"
......@@ -491,18 +517,28 @@ if [ -r /etc/os-release ]; then
os_id="${ID:-unknown}"
fi
export HOME="/tmp/epm-home"
mkdir -p "$HOME"
if [ -f "$SOURCE_DIR/bin/eepm" ]; then
HAS_SOURCE=1
export PATH="$SOURCE_DIR/bin:$PATH"
cd "$SOURCE_DIR"
else
cd "$HOME"
fi
if [ "$TEST_COMMAND" = "exec" ]; then
exec sh -c "$1"
fi
printf '[container] bootstrap: os_id=%s\n' "$os_id" >&2
if [ ! -f "$SOURCE_DIR/bin/eepm" ]; then
if [ "$HAS_SOURCE" -ne 1 ]; then
printf '[container] eepm tree does not contain ./bin/eepm\n' >&2
exit 3
fi
export HOME="/tmp/epm-home"
mkdir -p "$HOME"
export PATH="$SOURCE_DIR/bin:$PATH"
cd "$SOURCE_DIR"
case "$os_id" in
altlinux|alt)
run_eepm --auto repo set etersoft
......@@ -537,9 +573,6 @@ case "$TEST_COMMAND" in
shift
exec bash ./bin/eepm play --auto "$@" "$APP_NAME"
;;
exec)
exec bash -c "$1"
;;
*)
printf '[container] unsupported test command: %s\n' "$TEST_COMMAND" >&2
exit 64
......@@ -555,6 +588,7 @@ run_container_locally() {
local inner_script container_name
local current_user
local status
local -a docker_args
local -a inner_args
require_command docker
......@@ -570,23 +604,39 @@ run_container_locally() {
container_name="epm-test-$(sanitize_name "$APP_NAME")-$(sanitize_name "$SYSTEM_IMAGE")-$$"
fi
info "Using eepm tree: $resolved_source"
info "Target image: $SYSTEM_IMAGE"
current_user="$(id -un)"
if ((INTERNAL_LOCAL_RUN)); then
info "Runner: local docker (inside ssh session, user: $current_user)"
else
info "Runner: local docker"
if [[ -z "$EXEC_COMMAND" ]]; then
if [[ -n "$resolved_source" ]]; then
info "Using eepm tree: $resolved_source"
fi
info "Target image: $SYSTEM_IMAGE"
current_user="$(id -un)"
if ((INTERNAL_LOCAL_RUN)); then
info "Runner: local docker (inside ssh session, user: $current_user)"
else
info "Runner: local docker"
fi
fi
docker_args=(
run --rm
--name "$container_name"
--hostname epm-docker-test
)
if [[ -n "$resolved_source" ]]; then
docker_args+=(
--workdir /work/eepm
--volume "$resolved_source:/work/eepm:ro"
)
fi
if docker run --rm \
--name "$container_name" \
--hostname epm-docker-test \
--workdir /work/eepm \
--volume "$resolved_source:/work/eepm:ro" \
--volume "$inner_script:/tmp/epm-docker-test-inner.sh:ro" \
"$SYSTEM_IMAGE" \
sh /tmp/epm-docker-test-inner.sh "${inner_args[@]}"; then
docker_args+=(
--volume "$inner_script:/tmp/epm-docker-test-inner.sh:ro"
"$SYSTEM_IMAGE"
sh /tmp/epm-docker-test-inner.sh "${inner_args[@]}"
)
if docker "${docker_args[@]}"; then
status=0
else
status=$?
......@@ -605,6 +655,11 @@ build_remote_args() {
REMOTE_SYNC_DIR=""
target="$(remote_target)"
if [[ -n "$EXEC_COMMAND" ]]; then
REMOTE_ARGS+=(--exec "$EXEC_COMMAND" "$SYSTEM_IMAGE")
return 0
fi
if [[ "$SOURCE_KIND" == "local" || "$SOURCE_KIND" == "explicit" ]]; then
if remote_source="$(find_remote_builder_source_path "$target")"; then
info "Remote eepm tree found at: $remote_source"
......@@ -640,7 +695,7 @@ run_container_via_ssh() {
[[ -n "$REMOTE_USER" ]] || fatal "Remote user is empty"
target="${REMOTE_USER}@${REMOTE_HOST}"
info "Runner: ssh -> $target"
[[ -n "$EXEC_COMMAND" ]] || info "Runner: ssh -> $target"
build_remote_args
......@@ -674,11 +729,18 @@ run_container_via_ssh() {
run_once() {
local resolved_source
local run_mode
case "$RUN_MODE" in
run_mode="${EFFECTIVE_RUN_MODE:-$RUN_MODE}"
case "$run_mode" in
auto)
if can_use_local_docker; then
resolved_source="$(resolve_source_path)"
if [[ -n "$EXEC_COMMAND" ]]; then
resolved_source="$(resolve_exec_source_path)"
else
resolved_source="$(resolve_source_path)"
fi
run_container_locally "$resolved_source"
else
warn "Local Docker is unavailable; falling back to ssh runner"
......@@ -686,7 +748,11 @@ run_once() {
fi
;;
local)
resolved_source="$(resolve_source_path)"
if [[ -n "$EXEC_COMMAND" ]]; then
resolved_source="$(resolve_exec_source_path)"
else
resolved_source="$(resolve_source_path)"
fi
run_container_locally "$resolved_source"
;;
remote)
......@@ -706,6 +772,45 @@ test_description() {
fi
}
print_exec_header() {
local current_user
local desc
[[ -n "$EXEC_COMMAND" ]] || return 0
desc="$(test_description)"
info "Test command: $desc"
case "$RUN_MODE" in
auto)
if can_use_local_docker; then
EFFECTIVE_RUN_MODE="local"
info "Runner: local docker"
else
EFFECTIVE_RUN_MODE="remote"
warn "Local Docker is unavailable; falling back to ssh runner"
info "Runner: ssh -> $(remote_target)"
fi
;;
local)
EFFECTIVE_RUN_MODE="local"
if ((INTERNAL_LOCAL_RUN)); then
current_user="$(id -un)"
info "Runner: local docker (inside ssh session, user: $current_user)"
else
info "Runner: local docker"
fi
;;
remote)
EFFECTIVE_RUN_MODE="remote"
info "Runner: ssh -> $(remote_target)"
;;
*)
fatal "Unsupported run mode: $RUN_MODE"
;;
esac
}
run_for_system() {
local system_image="$1"
local index="$2"
......@@ -720,15 +825,19 @@ run_for_system() {
if ((total > 1)); then
info "Run [$index/$total]: $desc on $SYSTEM_IMAGE"
fi
info "Log file: $LOG_FILE"
info "Normalized system: $SYSTEM_IMAGE"
info "Test command: $desc"
if [[ -z "$EXEC_COMMAND" ]]; then
info "Log file: $LOG_FILE"
info "Normalized system: $SYSTEM_IMAGE"
info "Test command: $desc"
fi
run_once 2>&1 | tee "$LOG_FILE" && status=0 || status=$?
if ((status == 0)); then
printf '\nTest passed: %s on %s\n' "$desc" "$SYSTEM_IMAGE"
printf 'Log: %s\n' "$LOG_FILE"
if [[ -z "$EXEC_COMMAND" ]]; then
printf '\nTest passed: %s on %s\n' "$desc" "$SYSTEM_IMAGE"
printf 'Log: %s\n' "$LOG_FILE"
fi
else
printf '\nTest failed: %s on %s\n' "$desc" "$SYSTEM_IMAGE" >&2
printf 'Log: %s\n' "$LOG_FILE" >&2
......@@ -907,6 +1016,8 @@ main() {
build_target_systems
total="${#TARGET_SYSTEMS[@]}"
print_exec_header
if ((PARALLEL_JOBS != 0 && total > 1)); then
local result_dir
local i sys res log
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment