From c3a771547f2147fc2f4e10474e78a2f555651c9f Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 21 Aug 2019 22:27:52 +0200 Subject: [PATCH] travis: default to buster and also use debian:buster as docker container The unstable environment seems to be flasky, though the stretch one seems to be stable so far, let's try to update it towards buster. --- .travis.yml | 2 +- travis/build-vm.sh | 2 +- travis/execute.sh | 4 ++-- travis/serial-console-connection | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0a3f432..98b0e4b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ services: - docker env: - - TRAVIS_DEBIAN_DISTRIBUTION=stretch + - TRAVIS_DEBIAN_DISTRIBUTION=buster - TRAVIS_DEBIAN_DISTRIBUTION=unstable TRAVIS_DEBIAN_INCREMENT_VERSION_NUMBER=true script: diff --git a/travis/build-vm.sh b/travis/build-vm.sh index 9387d76..217813b 100755 --- a/travis/build-vm.sh +++ b/travis/build-vm.sh @@ -3,7 +3,7 @@ set -eu -o pipefail TARGET="${TARGET:-/code/qemu.img}" -RELEASE="${RELEASE:-stretch}" +RELEASE="${RELEASE:-buster}" cd "$(dirname "$TARGET")" apt update diff --git a/travis/execute.sh b/travis/execute.sh index 7d20e40..5b4f47a 100755 --- a/travis/execute.sh +++ b/travis/execute.sh @@ -18,7 +18,7 @@ if [ -z "${TRAVIS:-}" ] ; then fi fi -RELEASE="${RELEASE:-stretch}" +RELEASE="${RELEASE:-buster}" export RELEASE TARGET="${TARGET:-qemu.img}" @@ -69,7 +69,7 @@ else fi # we need to run in privileged mode to be able to use loop devices -docker run --privileged -v "$(pwd)":/code --rm -i -t debian:stretch /code/travis/build-vm.sh +docker run --privileged -v "$(pwd)":/code --rm -i -t debian:buster /code/travis/build-vm.sh [ -x ./goss ] || curl -fsSL https://goss.rocks/install | GOSS_DST="$(pwd)" sh diff --git a/travis/serial-console-connection b/travis/serial-console-connection index 46c2f02..ff3fbd0 100755 --- a/travis/serial-console-connection +++ b/travis/serial-console-connection @@ -13,9 +13,9 @@ parser = argparse.ArgumentParser(description='Connect to serial console ' + parser.add_argument('--port', required=True, help='serial console device to connect ' + 'to (e.g. /dev/pts/X)') -parser.add_argument('--hostname', default="stretch", +parser.add_argument('--hostname', default="buster", help='hostname of the system for login process ' + - '(default: stretch)') + '(default: buster)') parser.add_argument('--pipefile', default="./serial0", help='file name for named pipe file (for ' + 'interacting between host + VM via QEMU ' + -- 2.1.4