wip

Jenkinsfile

@@ -5,7 +5,7 @@ pipeline {
     stages{
         stage('unit test'){
             steps{
-                sh './jenkins.sh'
+                sh 'tox -rv'
             }
         }
         stage('packaging'){

get_wcs.sh

@@ -2,4 +2,3 @@
 
 test -d wcs || git clone http://git.entrouvert.org/wcs.git
 (cd wcs && git pull)
-tox -rv

pylint.sh

@@ -8,7 +8,7 @@ elif [ -f pylint.django.rc ]; then
 	PYLINT_RC=pylint.django.rc
 else
 	echo No pylint RC found
-	exit 1
+	exit 0
 fi
 
 pylint -f parseable --rcfile ${PYLINT_RC} "$@" | tee pylint.out || /bin/true

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = django18,django111
+envlist = dj{18,111}
 
 [testenv]
 usedevelop = True
@@ -8,8 +8,8 @@ setenv =
   DJANGO_SETTINGS_MODULE=combo.settings
   COMBO_SETTINGS_FILE=tests/settings.py
 deps =
-  django18: django>=1.8,<1.9
-  django111: django>=1.11,<1.12
+  dj18: django>=1.8,<1.9
+  dj111: django>=1.11,<1.12
   pytest-cov
   pytest-django
   pytest
@@ -23,5 +23,7 @@ deps =
   quixote<3.0
   vobject
 commands =
-  py.test {posargs: --junitxml=test_{envname}_results.xml --cov-report xml --cov=combo/ tests/}
-  django18: ./pylint.sh combo/
+  ./get_wcs.sh
+  dj18: py.test {posargs: --junitxml=test_{envname}_results.xml --cov-report xml --cov=combo/ tests/}
+  dj18: ./pylint.sh combo/
+  dj111: py.test {posargs: --junitxml=test_{envname}_results.xml tests/}