mirror of
https://github.com/JasonN3/build-container-installer.git
synced 2025-12-25 10:57:55 +01:00
add quotes
This commit is contained in:
parent
3fd3a2a2af
commit
76f0b24d2a
2 changed files with 9 additions and 4 deletions
11
.github/workflows/build-and-test.yml
vendored
11
.github/workflows/build-and-test.yml
vendored
|
|
@ -178,11 +178,13 @@ jobs:
|
||||||
|
|
||||||
- name: Verify ISO
|
- name: Verify ISO
|
||||||
run: |
|
run: |
|
||||||
|
set -e
|
||||||
checkisomd5 ${{ needs['build-and-push-iso']['outputs'][format('iso_name-{0}', matrix.version)] }}
|
checkisomd5 ${{ needs['build-and-push-iso']['outputs'][format('iso_name-{0}', matrix.version)] }}
|
||||||
sha256sum -c ${{ needs['build-and-push-iso']['outputs'][format('iso_name-{0}', matrix.version)] }}-CHECKSUM
|
sha256sum -c ${{ needs['build-and-push-iso']['outputs'][format('iso_name-{0}', matrix.version)] }}-CHECKSUM
|
||||||
|
|
||||||
- name: Run ISO checks
|
- name: Run ISO checks
|
||||||
run: |
|
run: |
|
||||||
|
set -e
|
||||||
mv ${{ needs['build-and-push-iso']['outputs'][format('iso_name-{0}', matrix.version)] }} deploy.iso
|
mv ${{ needs['build-and-push-iso']['outputs'][format('iso_name-{0}', matrix.version)] }} deploy.iso
|
||||||
make test-iso \
|
make test-iso \
|
||||||
ARCH=${{ env.ARCH}} \
|
ARCH=${{ env.ARCH}} \
|
||||||
|
|
@ -197,6 +199,7 @@ jobs:
|
||||||
|
|
||||||
- name: Add Kickstart and Grub options to ISO
|
- name: Add Kickstart and Grub options to ISO
|
||||||
run: |
|
run: |
|
||||||
|
set -e
|
||||||
sudo mkdir /mnt/iso || true
|
sudo mkdir /mnt/iso || true
|
||||||
sudo mount -o loop deploy.iso /mnt/iso
|
sudo mount -o loop deploy.iso /mnt/iso
|
||||||
cp /mnt/iso/boot/grub2/grub.cfg grub.cfg
|
cp /mnt/iso/boot/grub2/grub.cfg grub.cfg
|
||||||
|
|
@ -227,7 +230,8 @@ jobs:
|
||||||
|
|
||||||
- name: Install the test VM
|
- name: Install the test VM
|
||||||
run: |
|
run: |
|
||||||
timeout 1h qemu-system-x86_64 -name "Anaconda" -boot d -m 4096 -cpu qemu64 -display none -cdrom test.iso -smp 2 -hda disk.qcow2 -serial telnet:localhost:4321,server,nowait & QEMU_PID=$!
|
set -e
|
||||||
|
timeout 1h qemu-system-x86_64 -name "Anaconda" -boot d -m 4096 -cpu qemu64 -display none -cdrom test.iso -smp 2 -hda 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) &
|
||||||
|
|
@ -240,15 +244,16 @@ jobs:
|
||||||
VM_IP: "127.0.0.1"
|
VM_IP: "127.0.0.1"
|
||||||
VM_PORT: "5555"
|
VM_PORT: "5555"
|
||||||
run: |
|
run: |
|
||||||
|
set -e
|
||||||
mkfifo vm.stdin
|
mkfifo vm.stdin
|
||||||
qemu-system-x86_64 -name "Anaconda" \
|
qemu-system-x86_64 -name "Anaconda" \
|
||||||
-m 4096 -cpu qemu64 -display none -smp 2 \
|
-m 4096 -cpu qemu64 -display none -smp 2 \
|
||||||
-chardev socket,path=/tmp/qga.sock,server,nowait,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 disk.qcow2 -serial telnet:localhost:4321,server,nowait & export QEMU_PID=$!
|
-boot c -hda 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"
|
||||||
|
|
|
||||||
2
Makefile
2
Makefile
|
|
@ -35,7 +35,7 @@ get_templates = $(shell ls lorax_templates/$(1)_*.tmpl) \
|
||||||
# Get a list of tests for the feature
|
# Get a list of tests for the feature
|
||||||
# $1 = test type
|
# $1 = test type
|
||||||
# $2 = feature
|
# $2 = feature
|
||||||
run_tests = tests=$(shell ls tests/$(1)/$(2)_*); \
|
run_tests = tests="$(shell ls tests/$(1)/$(2)_*)"; \
|
||||||
if [ -n "$$tests" ]; \
|
if [ -n "$$tests" ]; \
|
||||||
then \
|
then \
|
||||||
chmod +x $$tests; \
|
chmod +x $$tests; \
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue