travis: Rename DOCKER_CMD to LINUX_CMD

The new name is arguably more informative, especially now
that we have MACOS_CMD and knowing that MINGW_CMD will
be introduced later on.

We still use DOCKER_CMD when calling Docker, and we assign
the actual script on a per-image basis. Having this
separation will help us when we introduce MinGW builds.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Andrea Bolognani 2018-06-07 17:54:43 +02:00
parent 90206eac15
commit aa3df9518d

View File

@ -12,11 +12,13 @@ matrix:
env: env:
- IMAGE=ubuntu:18.04 - IMAGE=ubuntu:18.04
- DISTCHECK_CONFIGURE_FLAGS="--with-init-script=systemd" - DISTCHECK_CONFIGURE_FLAGS="--with-init-script=systemd"
- DOCKER_CMD="$LINUX_CMD"
- services: - services:
- docker - docker
env: env:
- IMAGE=ubuntu:16.04 - IMAGE=ubuntu:16.04
- DISTCHECK_CONFIGURE_FLAGS="--with-init-script=upstart" - DISTCHECK_CONFIGURE_FLAGS="--with-init-script=upstart"
- DOCKER_CMD="$LINUX_CMD"
- compiler: clang - compiler: clang
language: c language: c
os: osx os: osx
@ -42,7 +44,7 @@ git:
env: env:
global: global:
- VIR_TEST_DEBUG=1 - VIR_TEST_DEBUG=1
- DOCKER_CMD=" - LINUX_CMD="
apt-get update && apt-get update &&
apt-get install -y \$PACKAGES && apt-get install -y \$PACKAGES &&
./autogen.sh && ./autogen.sh &&