diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 96c9625bfdbfaf21bd9eb3aef6736059dd1cd81e..16904f1070e0bbea9238811628cc9f8af7c1c359 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,13 +1,12 @@ -image: parras/nifty:latest +image: docker:stable stages: - build_docker - # - test + - test # - release before_script: - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN gitlab-registry.mpcdf.mpg.de - - docker info variables: CONTAINER_TEST_IMAGE: gitlab-registry.mpcdf.mpg.de/ift/nifty:$CI_BUILD_REF_NAME @@ -20,11 +19,11 @@ variables: # - > # coverage report | grep TOTAL | awk '{ print "TOTAL: "$6; }' -# test_python3_scalar: -# stage: test -# script: -# - python3 setup.py install --user -f -# - nosetests3 -q +test_python3_scalar: + stage: test + script: + - docker run $CONTAINER_TEST_IMAGE python3 setup.py install --user -f + - docker run $CONTAINER_TEST_IMAGE nosetests3 -q # test_python2_mpi: # stage: test @@ -54,7 +53,6 @@ services: - docker:dind build_docker_container: - image: docker:stable stage: build_docker script: - docker build -t $CONTAINER_TEST_IMAGE . diff --git a/Dockerfile b/Dockerfile index 3fc7ecbbf31570ec4d8bf5b44f4b275bb262ee75..2ec5a9dbdb730914eaa5e68eb4a570c26a662128 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,4 +14,4 @@ RUN pip3 install parameterized coverage pyfftw git+https://gitlab.mpcdf.mpg.de/i # Create user (openmpi does not like to be run as root) RUN useradd -ms /bin/bash testinguser USER testinguser -WORKDIR /home/testinguser +WORKDIR /home/testinguser \ No newline at end of file