Merge lp:~roadmr/isitdeployable/jenkins into lp:isitdeployable

[Daniel Manrique]

Use jenkins testing for make test, for better ols-jenkaas integration.

This is used in the test target replacing "test" itself.

Should be a drop-in replacement but it generates the reports directory with coverage and timing xml reports

Use jenkins testing for make test, for better ols-jenkaas integration.

This is used in the test target replacing "test" itself.

Should be a drop-in replacement but it generates the reports directory with coverage and timing xml reports

[Ricardo Kirkner (ricardokirkner)]

Should we maybe keep the "test" target for local development, and add a new target for jenkins specifically? This is to avoid the extra overhead of collecting performance and coverage metrics during local runs

[Daniel Manrique (roadmr)]

I timed and:

using "jenkins" instead of "test" takes the same time and adds the reports xml we care about with timing info.

using jenkins --enable-coverage takes 3x as long (90 seconds vs. 30). So for now I removed it because we don't care too much about coverage. But we discussed adding a make target that does coverage, and trying to use that in a separate jenkins job. I'll work on that next/later since coverage is useful but doesn't help with the problem at hand which is gathering info on slow tests.

[Ricardo Kirkner (ricardokirkner)]

LGTM

review: Approve

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/isitdeployable-docker/46/

=== modified file 'Makefile'
--- Makefile	2018-03-07 14:55:47 +0000
+++ Makefile	2018-03-09 11:43:12 +0000
@@ -129,7 +129,7 @@
 	$(MAKE) stop-supervisor
 
 test:
-	$(DJANGO_MANAGE) test $(ARGS)
+	$(DJANGO_MANAGE) jenkins $(ARGS)
 
 ### wheels ###
 $(WHEELS_DIR):
 
=== modified file 'django_project/settings_base.py'
--- django_project/settings_base.py	2018-01-30 23:38:28 +0000
+++ django_project/settings_base.py	2018-03-09 11:43:12 +0000
@@ -58,6 +58,7 @@
     'ordered_model',
     'checklist',
     'pgtools',
+    'django_jenkins',
     #'debug_toolbar',
 )
 INTERNAL_IPS = ('127.0.0.1',)
 
=== modified file 'requirements-devel.txt'
--- requirements-devel.txt	2016-09-27 14:31:46 +0000
+++ requirements-devel.txt	2018-03-09 11:43:12 +0000
@@ -1,3 +1,5 @@
 mock==1.0.1
 pbr==1.10.0
 testscenarios==0.5.0
+django-jenkins==0.110.0
+coverage==4.5.1