mirror of
https://github.com/JasonN3/build-container-installer.git
synced 2025-12-25 10:57:55 +01:00
double $ and show expected
This commit is contained in:
parent
4f7f861441
commit
76edeb887c
2 changed files with 18 additions and 11 deletions
|
|
@ -3,4 +3,11 @@
|
||||||
set -ex
|
set -ex
|
||||||
|
|
||||||
checkisomd5 ../../${ISO_NAME}
|
checkisomd5 ../../${ISO_NAME}
|
||||||
cd $(dirname ../../${ISO_NAME}) && sha256sum -c $(basename ${ISO_NAME})-CHECKSUM
|
cd $(dirname ../../${ISO_NAME}) && sha256sum -c $(basename ${ISO_NAME})-CHECKSUM
|
||||||
|
if [[ $? != 0 ]]
|
||||||
|
then
|
||||||
|
echo "Found:"
|
||||||
|
checkisomd5 --md5sumonly ../../${ISO_NAME}
|
||||||
|
echo "Expected:"
|
||||||
|
implantisomd5 --force base-39.iso
|
||||||
|
fi
|
||||||
|
|
@ -83,11 +83,11 @@ files/disk.qcow2:
|
||||||
|
|
||||||
.PHONY: install_os
|
.PHONY: install_os
|
||||||
install_os: files/install.iso files/disk.qcow2
|
install_os: files/install.iso files/disk.qcow2
|
||||||
timeout 1h qemu-system-x86_64 -name "Anaconda" -boot d -m 4096 -cpu qemu64 -display none -cdrom files/install.iso -smp 2 -hda files/disk.qcow2 -serial telnet:localhost:4321,server=on,wait=off & QEMU_PID=$!
|
timeout 1h qemu-system-x86_64 -name "Anaconda" -boot d -m 4096 -cpu qemu64 -display none -cdrom files/install.iso -smp 2 -hda files/disk.qcow2 -serial telnet:localhost:4321,server=on,wait=off & QEMU_PID=$$!
|
||||||
echo "PID: $QEMU_PID"
|
echo "PID: $$QEMU_PID"
|
||||||
timeout 1m bash -c "while ! (echo > /dev/tcp/127.0.0.1/4321); do sleep 0.1; done"
|
timeout 1m bash -c "while ! (echo > /dev/tcp/127.0.0.1/4321); do sleep 0.1; done"
|
||||||
(nc localhost 4321 | tee vm.stdout) &
|
(nc localhost 4321 | tee vm.stdout) &
|
||||||
wait $QEMU_PID
|
wait $$QEMU_PID
|
||||||
|
|
||||||
.ONESHELL:
|
.ONESHELL:
|
||||||
|
|
||||||
|
|
@ -98,21 +98,21 @@ start_vm: install_os
|
||||||
-m 4096 -cpu qemu64 -display none -smp 2 \
|
-m 4096 -cpu qemu64 -display none -smp 2 \
|
||||||
-chardev socket,path=/tmp/qga.sock,server=on,wait=off,id=qga0 \
|
-chardev socket,path=/tmp/qga.sock,server=on,wait=off,id=qga0 \
|
||||||
-device e1000,netdev=net0 \
|
-device e1000,netdev=net0 \
|
||||||
-netdev user,id=net0,hostfwd=tcp::${VM_PORT}-:22 \
|
-netdev user,id=net0,hostfwd=tcp::$(VM_PORT)-:22 \
|
||||||
-device virtio-serial \
|
-device virtio-serial \
|
||||||
-device virtserialport,chardev=qga0,name=org.qemu.guest_agent.0 \
|
-device virtserialport,chardev=qga0,name=org.qemu.guest_agent.0 \
|
||||||
-boot c -hda files/disk.qcow2 -serial telnet:localhost:4321,server=on,wait=off & export QEMU_PID=$!
|
-boot c -hda files/disk.qcow2 -serial telnet:localhost:4321,server=on,wait=off & export QEMU_PID=$$!
|
||||||
echo "PID: $QEMU_PID"
|
echo "PID: $$QEMU_PID"
|
||||||
|
|
||||||
timeout 1m bash -c "while ! (echo > /dev/tcp/127.0.0.1/4321); do sleep 0.1; done"
|
timeout 1m bash -c "while ! (echo > /dev/tcp/127.0.0.1/4321); do sleep 0.1; done"
|
||||||
(tail -f vm.stdin | nc localhost 4321 | tee vm.stdout) &
|
(tail -f vm.stdin | nc localhost 4321 | tee vm.stdout) &
|
||||||
|
|
||||||
timeout 30m bash -c "while ! (echo > /dev/tcp/${VM_IP}/${VM_PORT}); do sleep 1; done"
|
timeout 30m bash -c "while ! (echo > /dev/tcp/$(VM_IP)/$(VM_PORT)); do sleep 1; done"
|
||||||
|
|
||||||
if ! (echo > /dev/tcp/${VM_IP}/${VM_PORT})
|
if ! (echo > /dev/tcp/$(VM_IP)/$(VM_PORT))
|
||||||
then
|
then
|
||||||
echo "SSH must be installed and enabled inside the container"
|
echo "SSH must be installed and enabled inside the container"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "VM ready for tests at IP ${VM_IP}:${VM_PORT}"
|
echo "VM ready for tests at IP $(VM_IP):$(VM_PORT)"
|
||||||
$(MAKE) ansible_inventory VM_IP=${VM_IP} VM_PORT=${VM_PORT} VM_USER=core VM_PASS=foobar
|
$(MAKE) ansible_inventory VM_IP=$(VM_IP) VM_PORT=$(VM_PORT) VM_USER=core VM_PASS=foobar
|
||||||
Loading…
Add table
Add a link
Reference in a new issue