Dockerfile,docker-compose.yaml: run tests for every target

Signed-off-by: Nicolas Oliver <dario.n.oliver@intel.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Nicolas Oliver 2017-05-29 12:29:20 -07:00 committed by Mihai Tudor Panu
parent ce9742b355
commit afd9dd07e4
2 changed files with 4 additions and 13 deletions

View File

@ -41,7 +41,6 @@ ENV NVM_DIR /root/.nvm
RUN . $NVM_DIR/nvm.sh && nvm install $NODE_VERSION && nvm use $NODE_VERSION && \ RUN . $NVM_DIR/nvm.sh && nvm install $NODE_VERSION && nvm use $NODE_VERSION && \
npm install -g node-gyp && node-gyp install npm install -g node-gyp && node-gyp install
# Set Workdir # Set Workdir
WORKDIR /usr/src/app WORKDIR /usr/src/app

View File

@ -2,14 +2,6 @@ version: '2'
services: services:
ubuntu:
image: ubuntu:16.04
command: bash
environment:
- http_proxy
- https_proxy
- no_proxy
main: main:
build: build:
context: . context: .
@ -55,11 +47,11 @@ services:
build: build:
args: args:
- BUILDSWIGPYTHON=ON - BUILDSWIGPYTHON=ON
command: bash -c "make $$(make help | grep _pyupm_.*-python2 | sed 's/... //' | tr '\n' ' ')" command: bash -c "make $$(make help | grep _pyupm_.*-python2 | sed 's/... //' | tr '\n' ' ') && make test"
python3: python3:
extends: python2 extends: python2
command: bash -c "make $$(make help | grep _pyupm_.*-python3 | sed 's/... //' | tr '\n' ' ')" command: bash -c "make $$(make help | grep _pyupm_.*-python3 | sed 's/... //' | tr '\n' ' ') && make test"
java: java:
extends: main extends: main
@ -68,7 +60,7 @@ services:
- BUILDSWIGJAVA=ON - BUILDSWIGJAVA=ON
- CC=gcc-4.8 - CC=gcc-4.8
- CXX=g++-4.8 - CXX=g++-4.8
command: bash -c "make $$(make help | grep javaupm | sed 's/... //' | tr '\n' ' ')" command: bash -c "make $$(make help | grep javaupm | sed 's/... //' | tr '\n' ' ') && make test"
node4: node4:
extends: main extends: main
@ -76,7 +68,7 @@ services:
args: args:
- BUILDSWIGNODE=ON - BUILDSWIGNODE=ON
- NODE_VERSION=v4.1.2 - NODE_VERSION=v4.1.2
command: bash -c "make $$(make help | grep jsupm | sed 's/... //' | tr '\n' ' ')" command: bash -c "make $$(make help | grep jsupm | sed 's/... //' | tr '\n' ' ') && make test"
node5: node5:
extends: node4 extends: node4