[v5,1/8] travis: fix DOCKER_NAMESPACE variable setting

Message ID	1535410807-29034-2-git-send-email-odpbot@yandex.ru
State	New
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; From: Github ODP bot <odpbot@yandex.ru> To: lng-odp@lists.linaro.org Date: Mon, 27 Aug 2018 23:00:00 +0000 Message-Id: <1535410807-29034-2-git-send-email-odpbot@yandex.ru> In-Reply-To: <1535410807-29034-1-git-send-email-odpbot@yandex.ru> References: <1535410807-29034-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 681 Subject: [lng-odp] [PATCH v5 1/8] travis: fix DOCKER_NAMESPACE variable setting Precedence: list Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" <lng-odp-bounces@lists.linaro.org>
Series	[v5,1/8] travis: fix DOCKER_NAMESPACE variable setting \| expand [v5,1/8] travis: fix DOCKER_NAMESPACE variable setting [v5,2/8] travis: switch to unified 16.04 image [v5,3/8] m4: odp_dpdk: pass CFLAGS and LDFLAGS to CC when locating libdpdk.so [v5,4/8] travis: move netmap to install stage [v5,5/8] travis: restore quick build-only testing [v5,6/8] ci: rewrite coverage and distcheck scripts to follow other build scripts [v5,7/8] ci: move build stage to common script [v5,8/8] ci: do compile-after-install test

Message ID

1535410807-29034-2-git-send-email-odpbot@yandex.ru

State

New

Headers

Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org
	designates 54.197.127.237 as permitted sender)
	client-ip=54.197.127.237; 
From: Github ODP bot <odpbot@yandex.ru>
To: lng-odp@lists.linaro.org
Date: Mon, 27 Aug 2018 23:00:00 +0000
Message-Id: <1535410807-29034-2-git-send-email-odpbot@yandex.ru>
In-Reply-To: <1535410807-29034-1-git-send-email-odpbot@yandex.ru>
References: <1535410807-29034-1-git-send-email-odpbot@yandex.ru>
Github-pr-num: 681
Subject: [lng-odp] [PATCH v5 1/8] travis: fix DOCKER_NAMESPACE variable
	setting
Precedence: list
Errors-To: lng-odp-bounces@lists.linaro.org
Sender: "lng-odp" <lng-odp-bounces@lists.linaro.org>

Series

[v5,1/8] travis: fix DOCKER_NAMESPACE variable setting | expand

Commit Message

Github ODP bot Aug. 27, 2018, 11 p.m. UTC

From: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>


First, original commit missed one quote mark. Second, conditional ifs do
not work in env: part of .travis.yml. Set DOCKER_NAMESPACE properly.

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

Fixes: 989df5d2f97ab4711328b11282dcc743f5740e00
---
/** 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: 6ce60cac1fea6d65803740f5f9b6627abf6814b3
 ** Merge commit sha: 8c5d835ef3fbc6ab78503945fef582f7c60ac2c9
 **/
 .travis.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d1520aa1a..23629d538 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,7 +55,6 @@  env:
         # you need generated new one at https://codecov.io specific for your repo.
         - CODECOV_TOKEN=a733c34c-5f5c-4ff1-af4b-e9f5edb1ab5e
         - DPDK_VERS="17.11.3"
-        - if [ -z "${DOCKER_NAMESPACE} ] ; then export DOCKER_NAMESPACE="opendataplane"; fi
     matrix:
         - CONF=""
         - CONF="--disable-abi-compat"
@@ -75,6 +74,7 @@  compiler:
 install:
         - sudo apt-get install linux-headers-`uname -r`
 script:
+        - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi
         - if [ "${CC#clang}" != "${CC}" ] ; then LD="" CXX=clang++; fi
         - if [ -n "${CROSS_ARCH}" ] ; then
                docker run  -i -t -v `pwd`:/odp
@@ -104,6 +104,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}"
@@ -114,6 +115,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}" -e LD="${LD}" -e CXX="${CXX}"
@@ -150,6 +152,7 @@  jobs:
                 - stage: "build only"
                   env: Ubuntu14.04_arm64
                   script:
+                          - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi
                           - docker run  -i -t -v `pwd`:/odp
                               ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_14.04.05 /odp/scripts/ci/build_arm64.sh
                 - stage: test
@@ -174,6 +177,7 @@  jobs:
                   compiler: gcc
                   env: CROSS_ARCH="i386"
                   script:
+                          - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi
                           - docker run --privileged -i -t
                               -v `pwd`:/odp
                               -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}"
@@ -183,6 +187,7 @@  jobs:
                   compiler: clang
                   env: CROSS_ARCH="i386"
                   script:
+                          - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi
                           - docker run --privileged -i -t
                               -v `pwd`:/odp
                               -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}"
@@ -210,6 +215,7 @@  jobs:
                   compiler: gcc
                   env: CROSS_ARCH="i386" CONF="--disable-abi-compat"
                   script:
+                          - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi
                           - docker run --privileged -i -t
                               -v `pwd`:/odp
                               -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}"
@@ -219,6 +225,7 @@  jobs:
                   compiler: clang
                   env: CROSS_ARCH="i386" CONF="--disable-abi-compat"
                   script:
+                          - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi
                           - docker run --privileged -i -t
                               -v `pwd`:/odp
                               -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}"