From 0be5983b86f5fa9d439e123a27f121f759227988 Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Sat, 31 Oct 2026 22:01:22 +0100 Subject: [PATCH] f-82: e2e: image des VM de test choisie par VM_IMAGE #82 Signed-off-by: GnomeZworc --- test/e2e/lib/core.sh | 20 +++++++++++++++++--- test/e2e/lib/vm.sh | 17 +++++++++++++++++ test/e2e/run.sh | 3 +++ test/e2e/run_test.sh | 30 ++++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 3 deletions(-) diff --git a/test/e2e/lib/core.sh b/test/e2e/lib/core.sh index 9002402..af54f23 100644 --- a/test/e2e/lib/core.sh +++ b/test/e2e/lib/core.sh @@ -1,8 +1,22 @@ set -u API=http://127.0.0.1:8080 -IMAGE_URL=https://cloud.debian.org/images/cloud/bookworm/latest -IMAGE_FILE=debian-12-genericcloud-amd64.qcow2 -TWO_IMAGE=/var/tmp/deb-two.qcow2 +VM_IMAGE="${VM_IMAGE:-debian12}" +case "${VM_IMAGE}" in + debian12) + IMAGE_URL=https://cloud.debian.org/images/cloud/bookworm/latest + IMAGE_FILE=debian-12-genericcloud-amd64.qcow2 + TWO_IMAGE=/var/tmp/deb-two.qcow2 + ;; + rocky10) + IMAGE_DIR=/var/tmp/two-images + IMAGE_FILE=rocky10.qcow2 + TWO_IMAGE=/var/tmp/rocky10-two.qcow2 + ;; + *) + echo "VM_IMAGE inconnue : ${VM_IMAGE} (debian12, rocky10)" >&2 + exit 1 + ;; +esac VM_KEY=/root/.ssh/lab-vm VOLUMES=/var/lib/two/volumes diff --git a/test/e2e/lib/vm.sh b/test/e2e/lib/vm.sh index badc4c7..08f1b0e 100644 --- a/test/e2e/lib/vm.sh +++ b/test/e2e/lib/vm.sh @@ -1,5 +1,22 @@ two_image () { [ -f "${TWO_IMAGE}" ] && return 0 + case "${VM_IMAGE}" in + rocky10) two_image_built ;; + *) two_image_debian ;; + esac +} + +two_image_built () { + local want got + [ -f "${IMAGE_DIR}/${IMAGE_FILE}" ] || { echo "image: ${IMAGE_DIR}/${IMAGE_FILE} absente, à déposer depuis two-images" >&2; return 1; } + want=$(awk -v f="${IMAGE_FILE}" '$2 == f {print $1}' "${IMAGE_DIR}/SHA512SUMS") + [ -n "${want}" ] || { echo "image: ${IMAGE_FILE} absente de ${IMAGE_DIR}/SHA512SUMS" >&2; return 1; } + got=$(sha512sum < "${IMAGE_DIR}/${IMAGE_FILE}" | cut -d' ' -f1) || return 1 + [ "${got}" = "${want}" ] || { echo "image: somme SHA-512 incorrecte" >&2; return 1; } + cp "${IMAGE_DIR}/${IMAGE_FILE}" "${TWO_IMAGE}.part" && mv "${TWO_IMAGE}.part" "${TWO_IMAGE}" +} + +two_image_debian () { local work work=$(mktemp -d) curl -fsSL -o "${work}/${IMAGE_FILE}" "${IMAGE_URL}/${IMAGE_FILE}" || return 1 diff --git a/test/e2e/run.sh b/test/e2e/run.sh index a825dec..acd94ce 100755 --- a/test/e2e/run.sh +++ b/test/e2e/run.sh @@ -26,6 +26,8 @@ un échec, ou INATTENDU (compté comme un échec) s'il passe : retirer alors le compte les CONNU comme des échecs. known_flaky (échec intermittent) donne RÉUSSI, annoté, s'il passe. Une ligne RÉUSSI ou ÉCHOUÉ par vérification ; code de sortie 1 si une vérification échoue ou si aucune n'a été faite. +VM_IMAGE choisit l'image des VM de test : debian12 (défaut) ou rocky10 (déposée au préalable +dans /var/tmp/two-images/ de chaque hyperviseur, avec son SHA512SUMS). USAGE exit 2 } @@ -34,6 +36,7 @@ on () { local node="${1}" assignment lib shift { + printf 'export VM_IMAGE=%q\n' "${VM_IMAGE:-debian12}" for assignment in "$@"; do printf 'export %q=%q\n' "${assignment%%=*}" "${assignment#*=}" done diff --git a/test/e2e/run_test.sh b/test/e2e/run_test.sh index c4b301a..338cfac 100755 --- a/test/e2e/run_test.sh +++ b/test/e2e/run_test.sh @@ -58,6 +58,36 @@ test_on_sends_assignments_library_and_block_to_the_node () { teardown } +test_on_sends_the_vm_image_to_the_node () { + setup "on : VM_IMAGE transmise au nœud, debian12 par défaut" + printf '%s\n' "on hv1 <<'NODE'" 'true' 'NODE' > "${WORK}/scenarios/t1.sh" + FAKE_OUT='RÉUSSI: un' run t1 >/dev/null + [[ $(bash -c "$(grep '^export VM_IMAGE=' "${WORK}/payload.1"); echo \"\${VM_IMAGE}\"") == debian12 ]] || fail "défaut : $(grep '^export VM_IMAGE' "${WORK}/payload.1")" + rm -f "${WORK}/payload."* + VM_IMAGE=rocky10 FAKE_OUT='RÉUSSI: un' run t1 >/dev/null + [[ $(bash -c "$(grep '^export VM_IMAGE=' "${WORK}/payload.1"); echo \"\${VM_IMAGE}\"") == rocky10 ]] || fail "rocky10 : $(grep '^export VM_IMAGE' "${WORK}/payload.1")" + teardown +} + +test_two_image_built_checks_the_sum_before_copying () { + setup "two_image (rocky10) : image déposée vérifiée par SHA512SUMS puis copiée, refus sinon" + local d="${WORK}/images" out + mkdir -p "${d}" && printf 'qcow2\n' > "${d}/rocky10.qcow2" + (cd "${d}" && sha512sum rocky10.qcow2 > SHA512SUMS && printf '%s debian13.qcow2\n' "$(printf 'x' | sha512sum | cut -d' ' -f1)" >> SHA512SUMS) + built () { bash -c "VM_IMAGE=rocky10; $(printf ". '%s'; " "${DIR}"/lib/{core,vm}.sh)IMAGE_DIR='${d}'; TWO_IMAGE='${WORK}/two.qcow2'; ${1}" 2>&1; } + out=$(built 'two_image && cat "${TWO_IMAGE}"') || fail "image conforme refusée : ${out}" + [[ ${out} == qcow2 ]] || fail "copie : ${out}" + rm -f "${WORK}/two.qcow2" + printf 'autre\n' >> "${d}/rocky10.qcow2" + out=$(built 'two_image') && fail "image modifiée acceptée" + [[ ${out} == *"somme SHA-512 incorrecte"* ]] || fail "message : ${out}" + [[ ! -e "${WORK}/two.qcow2" ]] || fail "image modifiée copiée" + rm -f "${d}/rocky10.qcow2" + [[ $(built 'two_image') == *"absente, à déposer depuis two-images"* ]] || fail "image absente : $(built 'two_image')" + [[ $(bash -c "VM_IMAGE=ubuntu; . '${DIR}/lib/core.sh'; echo suite" 2>&1) == *"VM_IMAGE inconnue : ubuntu"* ]] || fail "image inconnue acceptée" + teardown +} + test_scenario_result_counts_and_exit_codes () { local CASE for CASE in ok fail none; do