[v3,6/6] travis: fix DOCKER_NAMESPACE variable setting

Message ID 1535288407-26837-7-git-send-email-odpbot@yandex.ru
State New
Headers show
Series
  • WIP: Travis: use Ubuntu 16.04 Docker image
Related show

Commit Message

Github ODP bot Aug. 26, 2018, 1 p.m.
From: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>


Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>

---
/** Email created from pull request 681 (lumag:travis-xenial)
 ** https://github.com/Linaro/odp/pull/681
 ** Patch: https://github.com/Linaro/odp/pull/681.patch
 ** Base sha: 989df5d2f97ab4711328b11282dcc743f5740e00
 ** Merge commit sha: 1bf5f265227e822d9820026c932d9c4fc22f2156
 **/
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Patch

diff --git a/.travis.yml b/.travis.yml
index 8ccf9f97a..647704553 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,7 +40,6 @@  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
-        - if [ -z "${DOCKER_NAMESPACE} ] ; then export DOCKER_NAMESPACE="opendataplane"; fi
     matrix:
         - CONF=""
         - CONF="--disable-abi-compat"
@@ -67,6 +66,7 @@  compiler:
 install:
         - sudo apt-get install linux-headers-`uname -r`
 script:
+        - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi
         - if [ -n "${CROSS_ARCH}" ] ; then
                docker run  -i -t -v `pwd`:/odp
                  -e CC="${CC}"
@@ -95,6 +95,7 @@  jobs:
                   env: TEST=coverage
                   compiler: gcc
                   script:
+                          - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi
                           - docker run --privileged -i -t
                               -v `pwd`:/odp --shm-size 8g
                               -e CODECOV_TOKEN="${CODECOV_TOKEN}"
@@ -105,6 +106,7 @@  jobs:
                   env: TEST=distcheck
                   compiler: gcc
                   script:
+                          - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi
                           - docker run --privileged -i -t
                               -v `pwd`:/odp --shm-size 8g
                               -e CC="${CC}"
@@ -145,6 +147,7 @@  jobs:
                              fi
                 - env: Ubuntu16.04_arm64
                   script:
+                          - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi
                           - docker run  -i -t -v `pwd`:/odp
                               -e CC="${CC}"
                               ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/build_arm64.sh