From 9a37acd4b1f20873a9f878beff720f963e2c1d13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Sun, 23 Sep 2018 13:45:31 -0400 Subject: [PATCH 1/2] Add Pytest/JUnit/Gitlab integration --- .gitlab-ci.yml | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1cd3a6c..ae69cfc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,19 @@ +Python 2.7 POCL: + script: + - export PY_EXE=python2.7 + - export PYOPENCL_TEST=portable + - export EXTRA_INSTALL="pybind11 numpy mako" + - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh + - ". ./build-and-test-py-project.sh" + tags: + - python2.7 + - pocl + except: + - tags + artifacts: + reports: + junit: test/pytest.xml + #Python 3.5 Titan X: # script: # - py_version=3.5 @@ -10,6 +26,9 @@ # - nvidia-titan-x # except: # - tags +# artifacts: +# reports: +# junit: test/pytest.xml Python 3.5 K40: script: @@ -24,20 +43,10 @@ Python 3.5 K40: - nvidia-k40 except: - tags + artifacts: + reports: + junit: test/pytest.xml -Python 2.7 POCL: - script: - - export PY_EXE=python2.7 - - export PYOPENCL_TEST=portable - - export EXTRA_INSTALL="pybind11 numpy mako" - - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh - - ". ./build-and-test-py-project.sh" - tags: - - python2.7 - - pocl - except: - - tags - Python 3.5 POCL: script: - export PY_EXE=python3.5 @@ -50,6 +59,9 @@ Python 3.5 POCL: - pocl except: - tags + artifacts: + reports: + junit: test/pytest.xml Python 3.6 POCL: script: @@ -63,6 +75,9 @@ Python 3.6 POCL: - pocl except: - tags + artifacts: + reports: + junit: test/pytest.xml Documentation: script: -- GitLab From 121ace34a915f002a8d1da4c6d027ac1bdb2bfee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Sun, 23 Sep 2018 13:47:32 -0400 Subject: [PATCH 2/2] Fix CI config indentation --- .gitlab-ci.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ae69cfc..0b5e7be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,9 +10,9 @@ Python 2.7 POCL: - pocl except: - tags - artifacts: - reports: - junit: test/pytest.xml + artifacts: + reports: + junit: test/pytest.xml #Python 3.5 Titan X: # script: @@ -26,9 +26,9 @@ Python 2.7 POCL: # - nvidia-titan-x # except: # - tags -# artifacts: -# reports: -# junit: test/pytest.xml +# artifacts: +# reports: +# junit: test/pytest.xml Python 3.5 K40: script: @@ -43,9 +43,9 @@ Python 3.5 K40: - nvidia-k40 except: - tags - artifacts: - reports: - junit: test/pytest.xml + artifacts: + reports: + junit: test/pytest.xml Python 3.5 POCL: script: @@ -59,9 +59,9 @@ Python 3.5 POCL: - pocl except: - tags - artifacts: - reports: - junit: test/pytest.xml + artifacts: + reports: + junit: test/pytest.xml Python 3.6 POCL: script: @@ -75,9 +75,9 @@ Python 3.6 POCL: - pocl except: - tags - artifacts: - reports: - junit: test/pytest.xml + artifacts: + reports: + junit: test/pytest.xml Documentation: script: -- GitLab