From ad5813a93c41e49851aebf8df9bcd46b7c89a0c1 Mon Sep 17 00:00:00 2001 From: Ivan Davidov Date: Wed, 2 Jan 2019 23:15:14 +0200 Subject: [PATCH] Travis CI updates. --- .travis.yml | 2 +- travis/99_autoshutdown.sh | 1 + travis/test_docker.sh | 1 + travis/test_qemu.sh | 2 +- travis/travis-ci.sh | 4 +++- 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index fd72647f0..40239382b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,5 +16,5 @@ services: - docker script: -- sudo apt-get -qq -y update - cd travis && ./travis-ci.sh + diff --git a/travis/99_autoshutdown.sh b/travis/99_autoshutdown.sh index 8574622d4..ed88b5c4e 100755 --- a/travis/99_autoshutdown.sh +++ b/travis/99_autoshutdown.sh @@ -6,3 +6,4 @@ sleep 30 && poweroff & cat << CEOF  Minimal Linux Live will shut down in 30 seconds. CEOF + diff --git a/travis/test_docker.sh b/travis/test_docker.sh index 9f753ffb7..40d040a12 100755 --- a/travis/test_docker.sh +++ b/travis/test_docker.sh @@ -24,3 +24,4 @@ cat << CEOF CEOF set +e + diff --git a/travis/test_qemu.sh b/travis/test_qemu.sh index a2ef0bf14..4174a6442 100755 --- a/travis/test_qemu.sh +++ b/travis/test_qemu.sh @@ -11,7 +11,6 @@ sudo apt-get -qq -y install qemu echo "`date` | *** MLL QEMU test - BEGIN ***" 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 -nographic & sleep 5 @@ -45,3 +44,4 @@ cat << CEOF CEOF set +e + diff --git a/travis/travis-ci.sh b/travis/travis-ci.sh index 465afde49..dea97b91a 100755 --- a/travis/travis-ci.sh +++ b/travis/travis-ci.sh @@ -12,10 +12,12 @@ sed -i "s|OVERLAY_LOCATION.*|OVERLAY_LOCATION=rootfs|" ../src/.config while true; do sleep 300; echo "`date` | >>> Heartbeat <<<"; done & -sudo apt-get -qq update +sudo apt-get -qq -y update +sudo apt-get -qq -y upgrade ./build_mll.sh ./test_docker.sh ./test_qemu.sh set +e +