Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/pr/143'
Browse files Browse the repository at this point in the history
  • Loading branch information
mika committed Oct 15, 2019
2 parents 6839f3b + c3a7715 commit 1a59168
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion travis/build-vm.sh
Expand Up @@ -3,7 +3,7 @@
set -eu -o pipefail

TARGET="${TARGET:-/code/qemu.img}"
RELEASE="${RELEASE:-stretch}"
RELEASE="${RELEASE:-buster}"

cd "$(dirname "$TARGET")"
apt update
Expand Down
4 changes: 2 additions & 2 deletions travis/execute.sh
Expand Up @@ -18,7 +18,7 @@ if [ -z "${TRAVIS:-}" ] ; then
fi
fi

RELEASE="${RELEASE:-stretch}"
RELEASE="${RELEASE:-buster}"
export RELEASE

TARGET="${TARGET:-qemu.img}"
Expand Down Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions travis/serial-console-connection
Expand Up @@ -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 ' +
Expand Down

0 comments on commit 1a59168

Please sign in to comment.