diff --git a/.travis.yml b/.travis.yml index a045e623d..483e843bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ --- language: generic +os: linux dist: trusty sudo: required @@ -8,4 +9,8 @@ services: - docker script: +#- sudo apt-get update - docker run --privileged -v $PWD:/minimal -it ubuntu:18.04 /bin/bash -c 'cd /minimal/travis && ./travis-ci.sh' +#- sudo chown -R $USER:$USER * +#- cd travis && ./test_qemu.sh + diff --git a/travis/test_qemu.sh b/travis/test_qemu.sh index 720118a0f..ff9a2b9df 100755 --- a/travis/test_qemu.sh +++ b/travis/test_qemu.sh @@ -10,7 +10,8 @@ apt-get -qq -y install qemu echo "`date` | *** MLL QEMU test - BEGIN ***" -qemu-system-x86_64 -m 1024M -cdrom minimal_linux_live.iso -boot d -localtime -nographic & +#qemu-system-x86_64 -m 256M -cdrom minimal_linux_live.iso -boot d -localtime -nographic & +qemu-system-x86_64 -m 256M -kernel work/kernel/kernel_installed/kernel -initrd work/rootfs.cpio.xz -append "console=ttyS0 console=tty0" -localtime -console sleep 5 diff --git a/travis/travis-ci.sh b/travis/travis-ci.sh index 5c7d68d10..b1bb5df0f 100755 --- a/travis/travis-ci.sh +++ b/travis/travis-ci.sh @@ -5,9 +5,10 @@ set -e # Apply Travis specific patches -mkdir -p ../src/minimal_overlay/rootfs/etc/autorun -cp 99_autoshutdown.sh ../src/minimal_overlay/rootfs/etc/autorun -cp -f syslinux.cfg ../src/minimal_boot/bios/boot/syslinux/syslinux.cfg +#mkdir -p ../src/minimal_overlay/rootfs/etc/autorun +#cp 99_autoshutdown.sh ../src/minimal_overlay/rootfs/etc/autorun +#cp -f syslinux.cfg ../src/minimal_boot/bios/boot/syslinux/syslinux.cfg +#sed -i "s|OVERLAY_LOCATION.*|OVERLAY_LOCATION=rootfs|" ../src/.config while true; do sleep 300; echo "`date` | >>> Heartbeat <<<"; done & @@ -18,3 +19,4 @@ apt-get -qq update #./test_docker.sh set +e +