diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 247cd975fb98ed0b25743a00dc71d689623fdbaa..eae45d02ddbce0094752d6a8e83d3478f9132ec5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,6 +42,10 @@ install:ubuntu_zesty: - "sh ci/scripts/install.sh ./build/gcc-6" dependencies: - build:ubuntu_zesty + artifacts: + paths: + - ./build + - /root/.local/lib/python2.7/site-packages/hysop test:ubuntu_zesty: image: keckj/hysop:ubuntu_zesty @@ -51,7 +55,10 @@ test:ubuntu_zesty: - mkdir -p "/home/hysoprunner" - chown hysoprunner:hysoprunner "/home/hysoprunner" - chmod u+rw "/home/hysoprunner" - - su hysoprunner -c "sh ci/scripts/test.sh ./build/gcc-6" + - chown hysoprunner:hysoprunner "/root/.local/lib/python2.7/site-packages/hysop" + - chmod u+rx "/root/.local/lib/python2.7/site-packages/hysop" + - export PYTHON_PATH="/root/.local/lib/python2.7/site-packages/hysop" + - su hysoprunner -c "sh ci/scripts/test.sh" dependencies: - install:ubuntu_zesty cache: diff --git a/ci/scripts/install.sh b/ci/scripts/install.sh index 269634655a501f5bb1b7f170d1d51069e82e45e0..1c79f78c8268b4e0eb88189eb16952330f6b79bb 100644 --- a/ci/scripts/install.sh +++ b/ci/scripts/install.sh @@ -16,6 +16,6 @@ BUILD_FOLDER="$1" cd $BUILD_FOLDER make install -python -c 'import hysop' +python -c 'import hysop; print hysop' exit 0 diff --git a/ci/scripts/test.sh b/ci/scripts/test.sh index 075baef2d6942716a056e6ff8f405bbb94923201..ebaa018856b22f8fcc2edc89b1d053644ad3b12b 100644 --- a/ci/scripts/test.sh +++ b/ci/scripts/test.sh @@ -6,5 +6,6 @@ if [ $# -ne 0 ]; then exit 1 fi -python "./hysop/operator/test_transpose.py" +python -c 'import hysop; print hysop' +python './hysop/operator/test_transpose.py' exit 0