[v5,5/8] travis: restore quick build-only testing

Message ID 1535410807-29034-6-git-send-email-odpbot@yandex.ru
State New
Headers show
Series
  • Travis: use Ubuntu 16.04 Docker image
Related show

Commit Message

Github ODP bot Aug. 27, 2018, 11 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: 6ce60cac1fea6d65803740f5f9b6627abf6814b3
 ** Merge commit sha: 8c5d835ef3fbc6ab78503945fef582f7c60ac2c9
 **/
 .travis.yml                | 35 ++++++++++++++++++++++++++++++++---
 scripts/ci/build_x86_64.sh | 11 -----------
 scripts/ci/check.sh        | 17 +++++++++++++++++
 3 files changed, 49 insertions(+), 14 deletions(-)
 create mode 100755 scripts/ci/check.sh

Patch

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