From: Maxim Uvarov <maxim.uva...@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uva...@linaro.org>
---
/** Email created from pull request 689 (muvarov:devel/master_u18)
** https://github.com/Linaro/odp/pull/689
** Patch: https://github.com/Linaro/odp/pull/689.patch
** Base sha: 0a5d67beda902557056d5b5146d8cbe86e5001b0
** Merge commit sha: d99b7ce145703f3cc45aa31026d10c02b861f999
**/
.travis.yml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 26431ff19..f2b97e4f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,6 +43,7 @@ env:
# for individual commit validation. But you you want to track tests
history
# you need generated new one at https://codecov.io specific for your
repo.
- CODECOV_TOKEN=a733c34c-5f5c-4ff1-af4b-e9f5edb1ab5e
+ - UBUNTU_VERS="16.04"
matrix:
- CONF=""
- CONF="--disable-abi-compat"
@@ -61,6 +62,7 @@ env:
- CONF="--disable-host-optimization --disable-abi-compat"
- CONF="--enable-pcapng-support"
- CONF="--without-openssl"
+ - CONF="" UBUNTU_VERS="18.04"
compiler:
- gcc
@@ -85,14 +87,14 @@ script:
docker run -i -t -v `pwd`:/odp
-e CC="${CC}"
-e CONF="${CONF}"
- ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04
/odp/scripts/ci/build_${CROSS_ARCH}.sh ;
+ ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_${UBUNTU_VERS}
/odp/scripts/ci/build_${CROSS_ARCH}.sh ;
else
echo "Running test" ;
docker run --privileged -i -t
-v `pwd`:/odp --shm-size 8g
-e CC="${CC}"
-e CONF="${CONF}"
- ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04
/odp/scripts/ci/check.sh ;
+ ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_${UBUNTU_VERS}
/odp/scripts/ci/check.sh ;
fi
jobs:
include:
