Merge lp:~cprov/uci-engine/webui-native-tickets into lp:uci-engine

Proposed by Celso Providelo on 2015-01-09
Status: Merged
Approved by: Ursula Junque on 2015-01-09
Approved revision: 917
Merged at revision: 919
Proposed branch: lp:~cprov/uci-engine/webui-native-tickets
Merge into: lp:uci-engine
Diff against target: 12 lines (+3/-0)
1 file modified
webui/tickets/static/tickets/webui.js (+3/-0)
To merge this branch: bzr merge lp:~cprov/uci-engine/webui-native-tickets
Reviewer Review Type Date Requested Status
Ursula Junque (community) 2015-01-09 Approve on 2015-01-09
Review via email: mp+245953@code.launchpad.net

Commit message

Fixing webui ticket list rendering JS failures when presenting native (non-citrain) tickets.

Description of the change

Fixing webui ticket list rendering JS failures when presenting native (non-citrain) tickets.

Native ticket have no citrain_overlay record, so 'landers' cannot be presented on the list.

To post a comment you must log in.
Ursula Junque (ursinha) wrote :

Simple enough, approved.

Just for the record (other people eventually reading), this is a testfix for https://code.launchpad.net/~cprov/uci-engine/tr-nova-failures/+merge/245739 test failures, end-to-end tests were reenabled in that branch and for some reason still unknown these tests started failing.

review: Approve
Ubuntu CI Bot (uci-bot) wrote :
Download full text (60.0 KiB)

The attempt to merge lp:~cprov/uci-engine/webui-native-tickets into lp:uci-engine failed. Below is the output from the failed tests.

2015-01-09 13:18:57 INFO juju.cmd supercommand.go:37 running jujud [1.20.14.1-precise-amd64 gc]
2015-01-09 13:18:57 DEBUG juju.agent agent.go:377 read agent config, format "1.18"
2015-01-09 13:18:57 INFO juju.jujud unit.go:78 unit agent unit-ci-airline-ts-django-0 start (1.20.14.1-precise-amd64 [gc])
2015-01-09 13:18:57 INFO juju.worker runner.go:260 start "api"
2015-01-09 13:18:57 INFO juju.state.api apiclient.go:242 dialing "wss://10.0.3.1:17070/"
2015-01-09 13:18:57 INFO juju.state.api apiclient.go:176 connection established to "wss://10.0.3.1:17070/"
2015-01-09 13:18:57 INFO juju.state.api apiclient.go:242 dialing "wss://10.0.3.1:17070/"
2015-01-09 13:18:57 INFO juju.state.api apiclient.go:176 connection established to "wss://10.0.3.1:17070/"
2015-01-09 13:18:57 INFO juju.state.api apiclient.go:242 dialing "wss://10.0.3.1:17070/"
2015-01-09 13:18:57 INFO juju.state.api apiclient.go:176 connection established to "wss://10.0.3.1:17070/"
2015-01-09 13:18:57 INFO juju.worker runner.go:260 start "upgrader"
2015-01-09 13:18:57 INFO juju.worker runner.go:260 start "logger"
2015-01-09 13:18:57 DEBUG juju.worker.logger logger.go:35 initial log config: "<root>=DEBUG"
2015-01-09 13:18:57 INFO juju.worker runner.go:260 start "uniter"
2015-01-09 13:18:57 DEBUG juju.worker.logger logger.go:60 logger setup
2015-01-09 13:18:57 INFO juju.worker runner.go:260 start "apiaddressupdater"
2015-01-09 13:18:57 INFO juju.worker runner.go:260 start "rsyslog"
2015-01-09 13:18:57 DEBUG juju.worker.rsyslog worker.go:75 starting rsyslog worker mode 1 for "unit-ci-airline-ts-django-0" "tarmac-local"
2015-01-09 13:18:57 DEBUG juju.worker.logger logger.go:45 reconfiguring logging from "<root>=DEBUG" to "<root>=WARNING;unit=DEBUG"
2015-01-09 13:19:14 INFO juju-log Making dir /srv/ci-airline-ts-django/code/ root:root 555
2015-01-09 13:19:15 INFO juju-log Adding dependencies.
2015-01-09 13:19:15 INFO juju-log installing apt packages...
2015-01-09 13:19:18 INFO config-changed gpg: keyring `/tmp/tmpZNDhub/secring.gpg' created
2015-01-09 13:19:18 INFO config-changed gpg: keyring `/tmp/tmpZNDhub/pubring.gpg' created
2015-01-09 13:19:18 INFO config-changed gpg: requesting key 6A8DFC40 from hkp server keyserver.ubuntu.com
2015-01-09 13:19:18 INFO config-changed gpg: /tmp/tmpZNDhub/trustdb.gpg: trustdb created
2015-01-09 13:19:19 INFO config-changed gpg: key 6A8DFC40: public key "Launchpad PPA for Canonical CI Engineering" imported
2015-01-09 13:19:19 INFO config-changed gpg: Total number processed: 1
2015-01-09 13:19:19 INFO config-changed gpg: imported: 1 (RSA: 1)
2015-01-09 13:19:19 INFO config-changed OK
2015-01-09 13:19:20 INFO config-changed Get:1 http://ppa.launchpad.net precise Release.gpg [316 B]
2015-01-09 13:19:20 INFO config-changed Get:2 http://ubuntu-cloud.archive.canonical.com precise-updates/cloud-tools Release.gpg [543 B]
2015-01-09 13:19:20 INFO config-changed Get:3 http://security.ubuntu.com precise-security Release.gpg [198 B]
2015-01-09 13:19:20 INFO config-changed Hit http://archi...

Vincent Ladeuil (vila) wrote :

2015-01-09 13:38:54 INFO juju-log pgsql:12: migration command failed, retrying...
2015-01-09 13:39:01 INFO pgsql-relation-joined OperationalError: could not connect to server: Connection refused
2015-01-09 13:39:01 INFO pgsql-relation-joined Is the server running on host "10.0.3.103" and accepting
2015-01-09 13:39:01 INFO pgsql-relation-joined TCP/IP connections on port 5432?
2015-01-09 13:39:01 INFO pgsql-relation-joined Syncing...
2015-01-09 13:39:01 INFO juju-log pgsql:12: migration command failed, retrying...
2015-01-09 13:39:09 INFO pgsql-relation-joined OperationalError: could not connect to server: Connection refused
2015-01-09 13:39:09 INFO pgsql-relation-joined Is the server running on host "10.0.3.103" and accepting
2015-01-09 13:39:09 INFO pgsql-relation-joined TCP/IP connections on port 5432?
2015-01-09 13:39:09 INFO pgsql-relation-joined Syncing...
2015-01-09 13:39:09 INFO juju-log pgsql:12: migration commConnection to 10.0.3.6 closed.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'webui/tickets/static/tickets/webui.js'
2--- webui/tickets/static/tickets/webui.js 2015-01-07 15:59:42 +0000
3+++ webui/tickets/static/tickets/webui.js 2015-01-09 12:49:14 +0000
4@@ -1019,6 +1019,9 @@
5 };
6
7 var format_landers = function (o) {
8+ if (o.data.citrain_overlay === null) {
9+ return '';
10+ }
11 return o.data.citrain_overlay.landers;
12 };
13

Subscribers

People subscribed via source and target branches