travis: change default ubuntu container version to 18.04

Separate DPDK v18.11 test has been removed. DPDK v18.11 is used now by
default in Ubuntu 18.04 x86 builds. DPDK v17.11 is still used in Ubuntu
16.04 builds.

Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Petri Savolainen <petri.savolainen@nokia.com>

3 files changed, 26 insertions, 43 deletions

diff --git a/.travis.yml b/.travis.yml
index e75ec5dc6..d3fafcb0c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,26 +49,22 @@ env:
         # you need to generate a new one at https://codecov.io specific for your
         # repo.
         - CODECOV_TOKEN=a733c34c-5f5c-4ff1-af4b-e9f5edb1ab5e
-        - OS=ubuntu_16.04
+        - OS=ubuntu_18.04
         - ARCH=x86_64
         - CHECK=1
         - NETMAP=0
     matrix:
         - CHECK=0 CONF="CFLAGS=-O3"
         - CHECK=0 CONF="CFLAGS=-O0 --enable-debug --enable-debug-print"
-        - CHECK=0 OS=ubuntu_18.04 CONF="CFLAGS=-O3"
-        - CHECK=0 OS=ubuntu_18.04 CONF="CFLAGS=-O0 --enable-debug --enable-debug-print"
         - CHECK=0 CONF="--enable-lto"
         - CHECK=0 CONF="--enable-lto --disable-abi-compat"
-        - CHECK=0 OS=ubuntu_18.04 CONF="--enable-lto"
-        - CHECK=0 OS=ubuntu_18.04 CONF="--enable-lto --disable-abi-compat"
         - CHECK=0 ARCH=arm64
         - CHECK=0 ARCH=armhf
-        - CHECK=0 ARCH=powerpc
+        - CHECK=0 ARCH=ppc64el
         - CHECK=0 ARCH=i386
         - CHECK=0 ARCH=arm64 CONF="--disable-abi-compat"
         - CHECK=0 ARCH=armhf CONF="--disable-abi-compat"
-        - CHECK=0 ARCH=powerpc CONF="--disable-abi-compat"
+        - CHECK=0 ARCH=ppc64el CONF="--disable-abi-compat"
         - CHECK=0 ARCH=i386 CONF="--disable-abi-compat"
         - CONF=""
         - CONF="--disable-abi-compat"
@@ -81,7 +77,7 @@ env:
         - CHECK=0 CONF="--enable-pcapng-support"
         - CHECK=0 OS=centos_7
         - CONF="--without-openssl --without-pcap"
-        - OS=ubuntu_18.04
+        - OS=ubuntu_16.04
 
 matrix:
   exclude:
@@ -93,10 +89,6 @@ matrix:
     env: CHECK=0 CONF="--enable-lto"
   - compiler: clang
     env: CHECK=0 CONF="--enable-lto --disable-abi-compat"
-  - compiler: clang
-    env: CHECK=0 OS=ubuntu_18.04 CONF="--enable-lto"
-  - compiler: clang
-    env: CHECK=0 OS=ubuntu_18.04 CONF="--enable-lto --disable-abi-compat"
 
 install:
         - if [ ${NETMAP} -eq 1 ] ; then
@@ -117,14 +109,14 @@ script:
                docker run  -i -t -v `pwd`:/odp --shm-size 8g
                  -e CC="${CC}"
                  -e CONF="${CONF}"
-                 ${DOCKER_NAMESPACE}/travis-odp-lng-${OS} /odp/scripts/ci/build_${ARCH}.sh ;
+                 ${DOCKER_NAMESPACE}/travis-odp-${OS}-${ARCH} /odp/scripts/ci/build_${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-${OS} /odp/scripts/ci/check.sh ;
+                 ${DOCKER_NAMESPACE}/travis-odp-${OS}-${ARCH} /odp/scripts/ci/check.sh ;
           fi
 jobs:
         include:
@@ -137,7 +129,7 @@ jobs:
                               -v `pwd`:/odp --shm-size 8g
                               -e CODECOV_TOKEN="${CODECOV_TOKEN}"
                               -e CC="${CC}"
-                              ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/coverage.sh
+                              ${DOCKER_NAMESPACE}/travis-odp-${OS}-${ARCH} /odp/scripts/ci/coverage.sh
                 - stage: test
                   env: TEST=scheduler_sp
                   compiler: gcc
@@ -148,7 +140,7 @@ jobs:
                               -e CC="${CC}"
                               -e CONF=""
                               -e ODP_SCHEDULER=sp
-                              ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/check.sh
+                              ${DOCKER_NAMESPACE}/travis-odp-${OS}-${ARCH} /odp/scripts/ci/check.sh
                 - stage: test
                   env: TEST=scheduler_scalable
                   compiler: gcc
@@ -159,7 +151,7 @@ jobs:
                               -e CC="${CC}"
                               -e CONF=""
                               -e ODP_SCHEDULER=scalable
-                              ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/check.sh
+                              ${DOCKER_NAMESPACE}/travis-odp-${OS}-${ARCH} /odp/scripts/ci/check.sh
                 - stage: test
                   env: TEST=process_mode
                   install:
@@ -173,19 +165,7 @@ jobs:
                               -e CONF=""
                               -e ODP_CONFIG_FILE=/odp/platform/linux-generic/test/process-mode.conf
                               -e ODPH_PROC_MODE=1
-                              ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/check.sh
-                - stage: test
-                  env: TEST=dpdk_18.11
-                  install:
-                          - true
-                  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 CONF=""
-                              ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04-dpdk_18.11 /odp/scripts/ci/check.sh
+                              ${DOCKER_NAMESPACE}/travis-odp-${OS}-${ARCH} /odp/scripts/ci/check.sh
                 - stage: test
                   env: TEST=inline_timer
                   install:
@@ -198,7 +178,7 @@ jobs:
                               -e CC="${CC}"
                               -e CONF=""
                               -e ODP_CONFIG_FILE=/odp/platform/linux-generic/test/inline-timer.conf
-                              ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/check_inline_timer.sh
+                              ${DOCKER_NAMESPACE}/travis-odp-${OS}-${ARCH} /odp/scripts/ci/check_inline_timer.sh
                 - stage: test
                   env: TEST=packet_align
                   install:
@@ -211,7 +191,7 @@ jobs:
                               -e CC="${CC}"
                               -e CONF=""
                               -e ODP_CONFIG_FILE=/odp/platform/linux-generic/test/packet_align.conf
-                              ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/check_pktio.sh
+                              ${DOCKER_NAMESPACE}/travis-odp-${OS}-${ARCH} /odp/scripts/ci/check_pktio.sh
                 - stage: test
                   env: TEST=distcheck
                   compiler: gcc
@@ -221,7 +201,7 @@ jobs:
                               -v `pwd`:/odp --shm-size 8g
                               -e CC="${CC}"
                               -e CONF="--enable-user-guides"
-                              ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/distcheck.sh
+                              ${DOCKER_NAMESPACE}/travis-odp-${OS}-${ARCH} /odp/scripts/ci/distcheck.sh
                 - stage: test
                   env: TEST=distcheck_nonabi
                   compiler: gcc
@@ -231,7 +211,7 @@ jobs:
                               -v `pwd`:/odp --shm-size 8g
                               -e CC="${CC}"
                               -e CONF="--enable-user-guides --disable-abi-compat"
-                              ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/distcheck.sh
+                              ${DOCKER_NAMESPACE}/travis-odp-${OS}-${ARCH} /odp/scripts/ci/distcheck.sh
                 - stage: test
                   env: TEST=out_of_tree
                   compiler: gcc
@@ -241,7 +221,7 @@ jobs:
                               -v `pwd`:/odp --shm-size 8g
                               -e CC="${CC}"
                               -e CONF=""
-                              ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/out_of_tree.sh
+                              ${DOCKER_NAMESPACE}/travis-odp-${OS}-${ARCH} /odp/scripts/ci/out_of_tree.sh
                 - stage: "build only"
                   env: TEST=documentation
                   compiler: gcc
@@ -314,7 +294,7 @@ jobs:
                           - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi
                           - docker run -i -t -v `pwd`:/odp --shm-size 8g
                               -e CC="${CC}"
-                              ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/build_${ARCH}.sh
+                              ${DOCKER_NAMESPACE}/travis-odp-${OS}-${ARCH} /odp/scripts/ci/build_${ARCH}.sh
                 - stage: "build only"
                   env: ARCH=x86_64
                   compiler: clang
@@ -324,7 +304,7 @@ jobs:
                           - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi
                           - docker run -i -t -v `pwd`:/odp --shm-size 8g
                               -e CC="${CC}"
-                              ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/build_${ARCH}.sh
+                              ${DOCKER_NAMESPACE}/travis-odp-${OS}-${ARCH} /odp/scripts/ci/build_${ARCH}.sh
                 - stage: "build only"
                   env: ARCH=arm64
                   install:
@@ -333,7 +313,7 @@ jobs:
                           - 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
+                              ${DOCKER_NAMESPACE}/travis-odp-${OS}-${ARCH} /odp/scripts/ci/build_${ARCH}.sh
                 - stage: "build only"
                   env: ARCH=i386
                   install:
@@ -342,7 +322,7 @@ jobs:
                           - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi
                           - docker run -i -t -v `pwd`:/odp --shm-size 8g
                               -e CC="${CC}"
-                              ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/build_${ARCH}.sh
+                              ${DOCKER_NAMESPACE}/travis-odp-${OS}-${ARCH} /odp/scripts/ci/build_${ARCH}.sh
                 - stage: test
                   canfail: yes
                   env: TEST=checkpatch
diff --git a/scripts/ci/build_armhf.sh b/scripts/ci/build_armhf.sh
index 837561f83..c13acaa08 100755
--- a/scripts/ci/build_armhf.sh
+++ b/scripts/ci/build_armhf.sh
@@ -9,8 +9,10 @@ else
 	export CC="${TARGET_ARCH}-gcc"
 	export CXX="${TARGET_ARCH}-g++"
 fi
-export CPPFLAGS="-I/usr/include/${TARGET_ARCH}/dpdk"
 export CFLAGS="-march=armv7-a"
 export CXXFLAGS="-march=armv7-a"
 
+# No DPDK on ARMv7
+export CONF="${CONF} --disable-dpdk"
+
 exec "$(dirname "$0")"/build.sh
diff --git a/scripts/ci/build_powerpc.sh b/scripts/ci/build_ppc64el.sh
index a213ee1d3..ca094c901 100755
--- a/scripts/ci/build_powerpc.sh
+++ b/scripts/ci/build_ppc64el.sh
@@ -1,15 +1,16 @@
 #!/bin/bash
 set -e
 
-export TARGET_ARCH=powerpc-linux-gnu
+export TARGET_ARCH=powerpc64le-linux-gnu
 if [ "${CC#clang}" != "${CC}" ] ; then
 	export CC="clang --target=${TARGET_ARCH}"
 	export CXX="clang++ --target=${TARGET_ARCH}"
+	# DPDK clang build broken
+	export CONF="${CONF} --disable-dpdk"
 else
 	export CC="${TARGET_ARCH}-gcc"
 	export CXX="${TARGET_ARCH}-g++"
 fi
-# No DPDK on PowerPC
-export CONF="${CONF} --disable-dpdk"
+export CPPFLAGS="-I/usr/include/${TARGET_ARCH}/dpdk"
 
 exec "$(dirname "$0")"/build.sh