Merge lp:~cjwatson/ols-jenkaas/remove-sca-ui-tests into lp:~ols-jenkaas-admins/ols-jenkaas/trunk

Proposed by Colin Watson
Status: Merged
Approved by: Adam Collard
Approved revision: 599
Merged at revision: 599
Proposed branch: lp:~cjwatson/ols-jenkaas/remove-sca-ui-tests
Merge into: lp:~ols-jenkaas-admins/ols-jenkaas/trunk
Diff against target: 60 lines (+0/-39)
1 file modified
jobs/software-center-agent.yaml (+0/-39)
To merge this branch: bzr merge lp:~cjwatson/ols-jenkaas/remove-sca-ui-tests
Reviewer Review Type Date Requested Status
Natalia Bidart (community) Approve
Review via email: mp+353155@code.launchpad.net

Commit message

Remove software-center-agent ui-tests jobs. There are no longer any UI tests for them to run.

To post a comment you must log in.
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'jobs/software-center-agent.yaml'
2--- jobs/software-center-agent.yaml 2018-04-18 14:32:56 +0000
3+++ jobs/software-center-agent.yaml 2018-08-15 09:50:29 +0000
4@@ -5,7 +5,6 @@
5 trunk: 'lp:software-center-agent'
6 setup: 'make bootstrap makemessages'
7 landing-tests: 'make start-db && CONCURRENCY=6 ./run-landing-tests'
8- ui-tests: 'touch collectstatic.deps.mk && make ui-tests ARGS='
9 deps-trunk: 'lp:~ubuntuone-pqm-team/software-center-agent/scasnap-dependencies'
10 charm-vcs: 'git'
11 charm-repo: 'ssh://git.launchpad.net/~ubuntuone-pqm-team/software-center-agent/+git/builds'
12@@ -20,8 +19,6 @@
13 job-timeout: 120
14 - 'trigger-{name}-build-charm-on-changes'
15 - '{name}-build-charm'
16- - 'trigger-{name}-ui-tests-on-changes'
17- - '{name}-ui-tests'
18 - 'test-{name}':
19 trunk: 'lp:~ubuntuone-hackers/{name}/jenkaas'
20 setup: 'bzr log -l5 && make bootstrap'
21@@ -70,39 +67,3 @@
22 - junit:
23 results: '{workdir}/reports/*.xml'
24 allow-empty-results: true
25-
26-- job-template:
27- name: 'trigger-{name}-ui-tests-on-changes'
28- description: 'Trigger ui tests on new {trunk} commits'
29- defaults: project
30- node: 'production-triggers'
31- disabled: !include: is-testing.yaml
32- project-type: freestyle
33- triggers:
34- - timed: 'H/5 * * * *'
35- builders:
36- # /!\ The job name must match below
37- - shell: annotate-output ~/jenkaas/project/detect-changes {vcs} {trunk} trigger-{name}-ui-tests-on-changes
38- - trigger-builds:
39- - project: '{name}-ui-tests'
40- block: true
41- publishers:
42- - archive:
43- artifacts: tip
44- latest-only: true
45- only-if-success: true
46- properties:
47- - build-discarder:
48- days-to-keep: 1
49-
50-- job-template:
51- name: '{name}-ui-tests'
52- description: "Run the ui tests for {trunk} (shared branch)"
53- defaults: project
54- project-type: freestyle
55- builders:
56- - wipe-workspace
57- - shell: annotate-output ~/jenkaas/project/run-tests {vcs} {trunk} {container} '/bin/true' '{ui-tests}' {workdir}
58- publishers:
59- - junit:
60- results: '{workdir}/static_src/junit/*.xml'

Subscribers

People subscribed via source and target branches