isitdeployable

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

  1. jenkins
  2. Merge into trunk
Proposed by Daniel Manrique
Status: Merged
Approved by: Daniel Manrique
Approved revision: 286
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: lp:~roadmr/isitdeployable/jenkins
Merge into: lp:isitdeployable
Diff against target: 34 lines (+4/-1)
3 files modified
Makefile (+1/-1)
django_project/settings_base.py (+1/-0)
requirements-devel.txt (+2/-0)
To merge this branch: bzr merge lp:~roadmr/isitdeployable/jenkins
Reviewer Review Type Date Requested Status
Ricardo Kirkner (community) Approve
Review via email: mp+341227@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Ricardo Kirkner (ricardokirkner) wrote :

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

Revision history for this message
Daniel Manrique (roadmr) wrote :

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.

Revision history for this message
Ricardo Kirkner (ricardokirkner) wrote :

LGTM

review: Approve
Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2018-03-07 14:55:47 +0000
3+++ Makefile 2018-03-09 11:43:12 +0000
4@@ -129,7 +129,7 @@
5 $(MAKE) stop-supervisor
6
7 test:
8- $(DJANGO_MANAGE) test $(ARGS)
9+ $(DJANGO_MANAGE) jenkins $(ARGS)
10
11 ### wheels ###
12 $(WHEELS_DIR):
13
14=== modified file 'django_project/settings_base.py'
15--- django_project/settings_base.py 2018-01-30 23:38:28 +0000
16+++ django_project/settings_base.py 2018-03-09 11:43:12 +0000
17@@ -58,6 +58,7 @@
18 'ordered_model',
19 'checklist',
20 'pgtools',
21+ 'django_jenkins',
22 #'debug_toolbar',
23 )
24 INTERNAL_IPS = ('127.0.0.1',)
25
26=== modified file 'requirements-devel.txt'
27--- requirements-devel.txt 2016-09-27 14:31:46 +0000
28+++ requirements-devel.txt 2018-03-09 11:43:12 +0000
29@@ -1,3 +1,5 @@
30 mock==1.0.1
31 pbr==1.10.0
32 testscenarios==0.5.0
33+django-jenkins==0.110.0
34+coverage==4.5.1

Subscribers

People subscribed via source and target branches