aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>2018-08-27 04:12:58 +0300
committerMaxim Uvarov <maxim.uvarov@linaro.org>2018-08-29 16:41:32 +0300
commit0ff72a3e3c9e7cbfde3d2b7d088a49e248fc779a (patch)
tree06776ba7cfcc9807d856f2e7ab6abc3e4f516c4c
parent39e3b88db39174279c1902a0153c6efeed894c5b (diff)
travis: restore quick build-only testing
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
-rw-r--r--.travis.yml35
-rwxr-xr-xscripts/ci/build_x86_64.sh11
-rwxr-xr-xscripts/ci/check.sh17
3 files changed, 49 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml
index 851d47ab0..26431ff19 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -92,7 +92,7 @@ script:
-v `pwd`:/odp --shm-size 8g
-e CC="${CC}"
-e CONF="${CONF}"
- ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/build_x86_64.sh ;
+ ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/check.sh ;
fi
jobs:
include:
@@ -152,12 +152,41 @@ jobs:
true
fi
- stage: "build only"
- env: Ubuntu16.04_arm64
+ env: ARCH=x86_64
+ install:
+ - true
+ 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_${ARCH}.sh
+ - stage: "build only"
+ env: ARCH=x86_64 CC=clang
+ install:
+ - true
+ 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_${ARCH}.sh
+ - stage: "build only"
+ env: ARCH=arm64
+ install:
+ - true
+ 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_${ARCH}.sh
+ - stage: "build only"
+ env: ARCH=i386
+ install:
+ - true
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
+ ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/build_${ARCH}.sh
- stage: test
canfail: yes
env: TEST=checkpatch
diff --git a/scripts/ci/build_x86_64.sh b/scripts/ci/build_x86_64.sh
index b9b170659..2ed2e005a 100755
--- a/scripts/ci/build_x86_64.sh
+++ b/scripts/ci/build_x86_64.sh
@@ -12,14 +12,3 @@ cd "$(dirname "$0")"/../..
${CONF}
make -j 8
-
-echo 1000 | tee /proc/sys/vm/nr_hugepages
-mkdir -p /mnt/huge
-mount -t hugetlbfs nodev /mnt/huge
-
-# Ignore possible failures there because these tests depends on measurements
-# and systems might differ in performance.
-export CI="true"
-make check
-
-umount /mnt/huge
diff --git a/scripts/ci/check.sh b/scripts/ci/check.sh
new file mode 100755
index 000000000..431686802
--- /dev/null
+++ b/scripts/ci/check.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+set -e
+
+"`dirname "$0"`"/build_x86_64.sh
+
+cd "$(dirname "$0")"/../..
+
+echo 1000 | tee /proc/sys/vm/nr_hugepages
+mkdir -p /mnt/huge
+mount -t hugetlbfs nodev /mnt/huge
+
+# Ignore possible failures there because these tests depends on measurements
+# and systems might differ in performance.
+export CI="true"
+make check
+
+umount /mnt/huge