Merge lp:~larry-e-works/uci-engine/add_cloud_archive into lp:uci-engine
- add_cloud_archive
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Larry E Works |
Approved revision: | 767 |
Merged at revision: | 804 |
Proposed branch: | lp:~larry-e-works/uci-engine/add_cloud_archive |
Merge into: | lp:uci-engine |
Prerequisite: | lp:~larry-e-works/uci-engine/update-charmhelpers-revno |
Diff against target: |
270 lines (+61/-32) 15 files modified
charms/precise/lander/charm-helpers.yaml (+0/-8) charms/precise/lander/config.yaml (+25/-4) charms/precise/lander/hooks/hooks.py (+1/-4) charms/precise/rabbitmq-worker/config.yaml (+7/-5) juju-deployer/branch-source-builder.yaml.tmpl (+3/-1) juju-deployer/gatekeeper.yaml.tmpl (+1/-1) juju-deployer/image-builder.yaml.tmpl (+3/-1) juju-deployer/lander.yaml.tmpl (+6/-1) juju-deployer/nf-stats-service.yaml.tmpl (+1/-1) juju-deployer/ppa-creator.yaml.tmpl (+3/-1) juju-deployer/publisher.yaml.tmpl (+3/-1) juju-deployer/test-runner.yaml.tmpl (+3/-1) juju-deployer/ticket-system.yaml.tmpl (+1/-1) juju-deployer/validator.yaml.tmpl (+3/-1) juju-deployer/webui.yaml.tmpl (+1/-1) |
To merge this branch: | bzr merge lp:~larry-e-works/uci-engine/add_cloud_archive |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Evan (community) | Approve | ||
Francis Ginther | Needs Fixing | ||
Review via email: mp+232463@code.launchpad.net |
Commit message
Added bits to the rabbitmq-
This merge is dependent upon the MP in ~larry-
Added bits to rabbitmq-
Added source: cloud:precise-
Description of the change
Added bits to the rabbitmq-
Added bits to rabbitmq-
Added source: cloud:precise-
PS Jenkins bot (ps-jenkins) wrote : | # |
Francis Ginther (fginther) wrote : | # |
The lander charm needs the same update as the rabbitmq-worker, it also implements a rabbit consumer queue. Same goes for the lander.yaml.tmpl file.
The new options for 'sources' and 'keys' provided by the updated charm-helpers could be used to replace the use of install_sources and install_keys in these charms. They basically do the same things except 'sources'/'keys' supports the cloud thingy. It's very strange that they are implemented differently in the charm-helpers themselves and were not just made part of charmhelpers.
No, I think you're spot on. Larry, can you please make use of a single option to specify the list of apt sources that should be imported, including the cloud archive, and a single option to specify the list of apt keys to be imported.
Thanks!
Larry E Works (larry-e-works) wrote : | # |
I was taking this in baby steps by:
a) only working with the rabbitmq-worker charm on this iteration.
b) leaving the existing configure_sources as they were.
I can make the other changes but it will make for a larger MP.
Making a larger MP is fine in this instance. I've also followed up with another inline comment, which should fix the issue you were seeing in the dependent branch.
Larry E Works (larry-e-works) wrote : | # |
Ok, looking through charmhelpers.fetch some more I found that add_sources() works with a single source/key pair where as configure_sources() works with multiple source/key pairs. Also configure_sources() calls add_source() for each source/key defined in the config file. Adjusted the rabbitmq-worker and lander charms to use (or to continue to use) configure_sources and added the needed bits to the template files and to lander/config.yaml.
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:765
http://
Executed test runs:
Click here to trigger a rebuild:
http://
Looks good. Top approving as well, since Larry is on holiday.
Ubuntu CI Bot (uci-bot) wrote : | # |
The attempt to merge lp:~larry-e-works/uci-engine/add_cloud_archive into lp:uci-engine failed. Below is the output from the failed tests.
Running cm...
Updating source dependencies...
Updating source dependencies...
uploading webui-content.tgz to swift
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Checking juju status
Private PPAs: disabled
Preparing local branch upload...
Uploading local branch, fingerprint 72729b6e001a43a
Building charm: chroot-builder
Building charm: webui
Building charm: lander
Building charm: rabbitmq-worker
Building charm: wsgi-app
Building charm: key-secret-
Building charm: system-image-server
Installing keys from bzr+ssh:
Running juju-deployer -v -c /tmp/tmp8DdiNV/
Problem deploying "ci-airline": Command '['juju-deployer', '-v', '-c', '/tmp/tmp8DdiNV
INFO:root:Creating a virtualenv to run under...
INFO:root:Asked to set the env to the virtualenv at /dev/shm/
INFO:root:
INFO:root:
key_read: uudecode AAAAB3NzaC1yc2E
failed
DEBUG:keystonec
INFO:requests.
Ubuntu CI Bot (uci-bot) wrote : | # |
The attempt to merge lp:~larry-e-works/uci-engine/add_cloud_archive into lp:uci-engine failed. Below is the output from the failed tests.
Running cm...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
uploading webui-content.tgz to swift
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Checking juju status
Private PPAs: disabled
Preparing local branch upload...
Uploading local branch, fingerprint 9383a364a1e360c
Building charm: lander
Building charm: wsgi-app
Building charm: rabbitmq-worker
Building charm: webui
Building charm: key-secret-
Building charm: system-image-server
Building charm: chroot-builder
Installing keys from bzr+ssh:
Running juju-deployer -v -c /tmp/tmpWj5wwE/
Problem deploying "ci-airline": Command '['juju-deployer', '-v', '-c', '/tmp/tmpWj5wwE
INFO:root:Creating a virtualenv to run under...
INFO:root:Asked to set the env to the virtualenv at /dev/shm/
INFO:root:
INFO:root:
key_read: uudecode AAAAB3NzaC1yc2E
failed
INFO:requests.
Ubuntu CI Bot (uci-bot) wrote : | # |
The attempt to merge lp:~larry-e-works/uci-engine/add_cloud_archive into lp:uci-engine failed. Below is the output from the failed tests.
Running cm...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
uploading webui-content.tgz to swift
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Checking juju status
Private PPAs: disabled
Preparing local branch upload...
Uploading local branch, fingerprint d3b3076fb1f0e3d
Building charm: lander
Building charm: wsgi-app
Building charm: rabbitmq-worker
Building charm: webui
Building charm: key-secret-
Building charm: system-image-server
Building charm: chroot-builder
Installing keys from bzr+ssh:
Running juju-deployer -v -c /tmp/tmpPV6pGo/
Problem deploying "ci-airline": Command '['juju-deployer', '-v', '-c', '/tmp/tmpPV6pGo
INFO:root:Creating a virtualenv to run under...
INFO:root:Asked to set the env to the virtualenv at /dev/shm/
INFO:root:
INFO:root:
key_read: uudecode AAAAB3NzaC1yc2E
failed
INFO:requests.
Ubuntu CI Bot (uci-bot) wrote : | # |
The attempt to merge lp:~larry-e-works/uci-engine/add_cloud_archive into lp:uci-engine failed. Below is the output from the failed tests.
Running cm...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
uploading webui-content.tgz to swift
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Checking juju status
Private PPAs: disabled
Preparing local branch upload...
Uploading local branch, fingerprint be327aa07992a40
Building charm: lander
Building charm: wsgi-app
Building charm: rabbitmq-worker
Building charm: webui
Building charm: key-secret-
Building charm: system-image-server
Building charm: chroot-builder
Installing keys from bzr+ssh:
Running juju-deployer -v -c /tmp/tmp6ifP6Y/
Problem deploying "ci-airline": Command '['juju-deployer', '-v', '-c', '/tmp/tmp6ifP6Y
INFO:root:Creating a virtualenv to run under...
INFO:root:Asked to set the env to the virtualenv at /dev/shm/
INFO:root:
INFO:root:
key_read: uudecode AAAAB3NzaC1yc2E
failed
INFO:requests.
Ubuntu CI Bot (uci-bot) wrote : | # |
The attempt to merge lp:~larry-e-works/uci-engine/add_cloud_archive into lp:uci-engine failed. Below is the output from the failed tests.
Running cm...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
uploading webui-content.tgz to swift
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Checking juju status
Private PPAs: disabled
Preparing local branch upload...
Uploading local branch, fingerprint d671ff036b228bd
Building charm: lander
Building charm: wsgi-app
Building charm: rabbitmq-worker
Building charm: webui
Building charm: key-secret-
Building charm: system-image-server
Building charm: chroot-builder
Installing keys from bzr+ssh:
Running juju-deployer -v -c /tmp/tmpJYMp19/
Problem deploying "ci-airline": Command '['juju-deployer', '-v', '-c', '/tmp/tmpJYMp19
INFO:root:Creating a virtualenv to run under...
INFO:root:Asked to set the env to the virtualenv at /dev/shm/
INFO:root:
INFO:root:
key_read: uudecode AAAAB3NzaC1yc2E
failed
INFO:requests.
Ubuntu CI Bot (uci-bot) wrote : | # |
The attempt to merge lp:~larry-e-works/uci-engine/add_cloud_archive into lp:uci-engine failed. Below is the output from the failed tests.
Running cm...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
uploading webui-content.tgz to swift
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Checking juju status
Private PPAs: disabled
Preparing local branch upload...
Uploading local branch, fingerprint bedfeb4ed64a674
Building charm: lander
Building charm: wsgi-app
Building charm: rabbitmq-worker
Building charm: webui
Building charm: key-secret-
Building charm: system-image-server
Building charm: chroot-builder
Installing keys from bzr+ssh:
Running juju-deployer -v -c /tmp/tmpYNZJM_
Problem deploying "ci-airline": Command '['juju-deployer', '-v', '-c', '/tmp/tmpYNZJM_
INFO:root:Creating a virtualenv to run under...
INFO:root:Asked to set the env to the virtualenv at /dev/shm/
INFO:root:
INFO:root:
key_read: uudecode AAAAB3NzaC1yc2E
failed
INFO:requests.
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:766
http://
Executed test runs:
Click here to trigger a rebuild:
http://
Ubuntu CI Bot (uci-bot) wrote : | # |
The attempt to merge lp:~larry-e-works/uci-engine/add_cloud_archive into lp:uci-engine failed. Below is the output from the failed tests.
Running cm...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
uploading webui-content.tgz to swift
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
2014-09-24 07:29:55 INFO juju.cmd supercommand.go:37 running jujud [1.20.7.
2014-09-24 07:29:55 DEBUG juju.agent agent.go:377 read agent config, format "1.18"
2014-09-24 07:29:55 INFO juju.jujud unit.go:78 unit agent unit-ci-
2014-09-24 07:29:55 INFO juju.worker runner.go:260 start "api"
2014-09-24 07:29:55 INFO juju.state.api apiclient.go:242 dialing "wss://
2014-09-24 07:30:01 INFO juju.state.api apiclient.go:176 connection established to "wss://
2014-09-24 07:30:01 INFO juju.state.api apiclient.go:242 dialing "wss://
2014-09-24 07:30:01 INFO juju.state.api apiclient.go:176 connection established to "wss://
2014-09-24 07:30:02 INFO juju.state.api apiclient.go:242 dialing "wss://
2014-09-24 07:30:02 INFO juju.state.api apiclient.go:176 connection established to "wss://
2014-09-24 07:30:02 INFO juju.worker runner.go:260 start "upgrader"
2014-09-24 07:30:02 INFO juju.worker runner.go:260 start "logger"
2014-09-24 07:30:02 DEBUG juju.worker.logger logger.go:35 initial log config: "<root>=DEBUG"
2014-09-24 07:30:02 INFO juju.worker runner.go:260 start "uniter"
2014-09-24 07:30:02 DEBUG juju.worker.logger logger.go:60 logger setup
2014-09-24 07:30:02 INFO juju.worker runner.go:260 start "apiaddressupdater"
2014-09-24 07:30:02 INFO juju.worker runner.go:260 start "rsyslog"
2014-09-24 07:30:02 DEBUG juju.worker.rsyslog worker.go:75 starting rsyslog worker mode 1 for "unit-ci-
2014-09-24 07:30:02 DEBUG juju.worker.logger logger.go:45 reconfiguring logging from "<root>=DEBUG" to "<root>
2014-09-24 07:30:16 INFO juju-log Making dir /srv/ci-
2014-09-24 07:30:16 INFO juju-log installing apt packages...
2014-09-24 07:30:18 INFO install gpg: keyring `/tmp/tmp5I1LvZ
2014-09-24 07:30:18 INFO install gpg: keyring `/tmp/tmp5I1LvZ
2014-09-24 07:30:18 INFO install gpg: requesting key 6A8DFC40 from hkp server keyserver.
2014-09-24 07:30:18 INFO install gpg: /tmp/tmp5I1LvZ/
2014-09-24 07:30:18 INFO install gpg: key 6A8DFC40: public key "Launchpad PPA for Canonical CI Engineering" imported
2014-09-24 07:30:18 INFO install gpg: Total number processed: 1
2014-09-24 07:30:18 INFO install gpg: imported: 1 (RSA: 1)
2014-09-24 07:30:19 INFO install OK
2014-09-24 07:30:20 INFO install Get:1 http://
2014-09-24 07:30:20 INFO install Get:2 http://
2014-0...
Ubuntu CI Bot (uci-bot) wrote : | # |
The attempt to merge lp:~larry-e-works/uci-engine/add_cloud_archive into lp:uci-engine failed. Below is the output from the failed tests.
Running cm...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
uploading webui-content.tgz to swift
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
2014-09-24 10:06:40 INFO juju.cmd supercommand.go:37 running jujud [1.20.7.
2014-09-24 10:06:40 DEBUG juju.agent agent.go:377 read agent config, format "1.18"
2014-09-24 10:06:40 INFO juju.jujud unit.go:78 unit agent unit-ci-
2014-09-24 10:06:40 INFO juju.worker runner.go:260 start "api"
2014-09-24 10:06:40 INFO juju.state.api apiclient.go:242 dialing "wss://
2014-09-24 10:06:40 INFO juju.state.api apiclient.go:176 connection established to "wss://
2014-09-24 10:06:40 INFO juju.state.api apiclient.go:242 dialing "wss://
2014-09-24 10:06:40 INFO juju.state.api apiclient.go:176 connection established to "wss://
2014-09-24 10:06:41 INFO juju.state.api apiclient.go:242 dialing "wss://
2014-09-24 10:06:41 INFO juju.state.api apiclient.go:176 connection established to "wss://
2014-09-24 10:06:41 INFO juju.worker runner.go:260 start "upgrader"
2014-09-24 10:06:41 INFO juju.worker runner.go:260 start "logger"
2014-09-24 10:06:41 DEBUG juju.worker.logger logger.go:35 initial log config: "<root>=DEBUG"
2014-09-24 10:06:41 INFO juju.worker runner.go:260 start "uniter"
2014-09-24 10:06:41 DEBUG juju.worker.logger logger.go:60 logger setup
2014-09-24 10:06:41 INFO juju.worker runner.go:260 start "apiaddressupdater"
2014-09-24 10:06:41 INFO juju.worker runner.go:260 start "rsyslog"
2014-09-24 10:06:41 DEBUG juju.worker.rsyslog worker.go:75 starting rsyslog worker mode 1 for "unit-ci-
2014-09-24 10:06:41 DEBUG juju.worker.logger logger.go:45 reconfiguring logging from "<root>=DEBUG" to "<root>
2014-09-24 10:06:50 INFO juju-log Making dir /srv/ci-
2014-09-24 10:06:50 INFO juju-log installing apt packages...
2014-09-24 10:06:59 INFO install gpg: keyring `/tmp/tmpsAeG0Z
2014-09-24 10:06:59 INFO install gpg: keyring `/tmp/tmpsAeG0Z
2014-09-24 10:06:59 INFO install gpg: requesting key 6A8DFC40 from hkp server keyserver.
2014-09-24 10:06:59 INFO install gpg: /tmp/tmpsAeG0Z/
2014-09-24 10:06:59 INFO install gpg: key 6A8DFC40: public key "Launchpad PPA for Canonical CI Engineering" imported
2014-09-24 10:06:59 INFO install gpg: Total number processed: 1
2014-09-24 10:06:59 INFO install gpg: imported: 1 (RSA: 1)
2014-09-24 10:07:00 INFO install OK
2014-09-24 10:07:11 INFO install Get:1 http://
2014-09-24 10:07:11 INFO install Hit http://
2014-09-24 10:07:11 INFO install Get:2 http://
- 767. By Larry E Works
-
Re-merged from trunk, no conflicts.
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:767
http://
Executed test runs:
Click here to trigger a rebuild:
http://
Preview Diff
1 | === modified file 'charms/precise/lander/charm-helpers.yaml' |
2 | --- charms/precise/lander/charm-helpers.yaml 2014-06-30 15:58:01 +0000 |
3 | +++ charms/precise/lander/charm-helpers.yaml 2014-09-25 13:07:15 +0000 |
4 | @@ -1,11 +1,3 @@ |
5 | -# This is the config file for syncing the charm-helpers modules. |
6 | -# To use: |
7 | -# bzr branch lp:charm-helpers /tmp/charm-helpers |
8 | -# /tmp/charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py \ |
9 | -# -c charm-helpers.yaml |
10 | -# |
11 | -destination: lib/charmhelpers |
12 | -branch: lp:charm-helpers |
13 | include: |
14 | - core |
15 | - fetch |
16 | |
17 | === modified file 'charms/precise/lander/config.yaml' |
18 | --- charms/precise/lander/config.yaml 2014-06-30 22:00:00 +0000 |
19 | +++ charms/precise/lander/config.yaml 2014-09-25 13:07:15 +0000 |
20 | @@ -11,10 +11,31 @@ |
21 | type: string |
22 | default: "/srv/" |
23 | description: The root directory the service will be installed in |
24 | - sources: |
25 | - type: string |
26 | - default: "" |
27 | - description: "List of extra apt sources to add (';' separated)." |
28 | + install_sources: |
29 | + type: string |
30 | + default: "" |
31 | + description: | |
32 | + YAML list of additional installation sources, as a string. The number |
33 | + of install_sources must match the number of install_keys. For |
34 | + example: |
35 | + install_sources: | |
36 | + - "ppa:project1/ppa" |
37 | + - "cloud:precise-proposed/folsom" |
38 | + - "http://example.com/repo precise main" |
39 | + install_keys: |
40 | + type: string |
41 | + default: "" |
42 | + description: | |
43 | + YAML list of GPG keys for installation sources, as a string. For apt |
44 | + repository URLs, use the public key ID used to verify package |
45 | + signatures. For other sources such as PPA, use null. This |
46 | + list must have the same number of elements as install_sources, even |
47 | + if the key items are all empty string. An example to go with the |
48 | + above for install_sources: |
49 | + install_keys: | |
50 | + - null |
51 | + - null |
52 | + - "a1b2c3d4" |
53 | packages: |
54 | type: string |
55 | default: "" |
56 | |
57 | === modified file 'charms/precise/lander/hooks/hooks.py' |
58 | --- charms/precise/lander/hooks/hooks.py 2014-07-09 16:55:27 +0000 |
59 | +++ charms/precise/lander/hooks/hooks.py 2014-09-25 13:07:15 +0000 |
60 | @@ -67,10 +67,7 @@ |
61 | def add_dependencies(): |
62 | juju_info('Adding dependencies.') |
63 | config = core.hookenv.config() |
64 | - sources = config['sources'].split(';') |
65 | - for source in sources: |
66 | - fetch.add_source(source) |
67 | - fetch.apt_update() |
68 | + fetch.configure_sources(update=True) |
69 | for package in config['packages'].split(): |
70 | fetch.apt_install(package, fatal=True) |
71 | |
72 | |
73 | === modified file 'charms/precise/rabbitmq-worker/config.yaml' |
74 | --- charms/precise/rabbitmq-worker/config.yaml 2014-07-30 07:15:34 +0000 |
75 | +++ charms/precise/rabbitmq-worker/config.yaml 2014-09-25 13:07:15 +0000 |
76 | @@ -61,21 +61,23 @@ |
77 | of install_sources must match the number of install_keys. For |
78 | example: |
79 | install_sources: | |
80 | - - ppa:project1/ppa |
81 | - - ppa:project2/ppa |
82 | + - "ppa:project1/ppa" |
83 | + - "cloud:precise-proposed/folsom" |
84 | + - "http://example.com/repo precise main" |
85 | install_keys: |
86 | type: string |
87 | default: "" |
88 | description: | |
89 | YAML list of GPG keys for installation sources, as a string. For apt |
90 | repository URLs, use the public key ID used to verify package |
91 | - signatures. For other sources such as PPA, use empty string. This |
92 | + signatures. For other sources such as PPA, use null. This |
93 | list must have the same number of elements as install_sources, even |
94 | if the key items are all empty string. An example to go with the |
95 | above for install_sources: |
96 | install_keys: | |
97 | - - "" |
98 | - - "" |
99 | + - null |
100 | + - null |
101 | + - "a1b2c3d4" |
102 | |
103 | # Required by 'nrpe-external-master' interface. |
104 | nagios_context: |
105 | |
106 | === modified file 'juju-deployer/branch-source-builder.yaml.tmpl' |
107 | --- juju-deployer/branch-source-builder.yaml.tmpl 2014-09-12 00:27:02 +0000 |
108 | +++ juju-deployer/branch-source-builder.yaml.tmpl 2014-09-25 13:07:15 +0000 |
109 | @@ -12,8 +12,10 @@ |
110 | packages: "debhelper devscripts dput lazr.enum python-dput python-gnupg python-swiftclient python-txstatsd" |
111 | install_sources: | |
112 | - ${CI_PPA} |
113 | + - "cloud:precise-icehouse" |
114 | install_keys: | |
115 | - - "" |
116 | + - null |
117 | + - null |
118 | cron_cmd: ./run-python ./branch-source-builder/bin/check_bsbuilder.py |
119 | cron_schedule: "0 * * * *" |
120 | # Using the service owner as cron_user. |
121 | |
122 | === modified file 'juju-deployer/gatekeeper.yaml.tmpl' |
123 | --- juju-deployer/gatekeeper.yaml.tmpl 2014-09-02 13:02:01 +0000 |
124 | +++ juju-deployer/gatekeeper.yaml.tmpl 2014-09-25 13:07:15 +0000 |
125 | @@ -13,7 +13,7 @@ |
126 | install_sources: | |
127 | - ${CI_PPA} |
128 | install_keys: | |
129 | - - "" |
130 | + - null |
131 | nagios_check_http_params: -H gatekeeper -I 127.0.0.1 -e ' |
132 | 200 OK' --url='/api/v1/' -p 8080 |
133 | nagios_check_health_params: -t 120 gatekeeper.health |
134 | |
135 | === modified file 'juju-deployer/image-builder.yaml.tmpl' |
136 | --- juju-deployer/image-builder.yaml.tmpl 2014-07-19 03:07:33 +0000 |
137 | +++ juju-deployer/image-builder.yaml.tmpl 2014-09-25 13:07:15 +0000 |
138 | @@ -15,8 +15,10 @@ |
139 | unit-config: include-base64://configs/unit_config.yaml |
140 | install_sources: | |
141 | - ${CI_PPA} |
142 | + - "cloud:precise-icehouse" |
143 | install_keys: | |
144 | - - "" |
145 | + - null |
146 | + - null |
147 | ci-airline-rabbit: |
148 | branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server@47 |
149 | charm: rabbitmq |
150 | |
151 | === modified file 'juju-deployer/lander.yaml.tmpl' |
152 | --- juju-deployer/lander.yaml.tmpl 2014-07-29 19:24:26 +0000 |
153 | +++ juju-deployer/lander.yaml.tmpl 2014-09-25 13:07:15 +0000 |
154 | @@ -19,7 +19,12 @@ |
155 | options: |
156 | current_code: ${CI_PAYLOAD_URL} |
157 | available_code: ${CI_PAYLOAD_URL} |
158 | - sources: ${CI_PPA} |
159 | + install_sources: | |
160 | + - ${CI_PPA} |
161 | + - "cloud:precise-icehouse" |
162 | + install_keys: | |
163 | + - null |
164 | + - null |
165 | packages: "python-amqplib python-swiftclient lazr.enum" |
166 | unit-config: include-base64://configs/unit_config.yaml |
167 | main: ./run-python ./lander/lander/run_worker.py --service-name ci-airline-ts-django --service-port 8080 --delay 10 |
168 | |
169 | === modified file 'juju-deployer/nf-stats-service.yaml.tmpl' |
170 | --- juju-deployer/nf-stats-service.yaml.tmpl 2014-07-11 21:30:57 +0000 |
171 | +++ juju-deployer/nf-stats-service.yaml.tmpl 2014-09-25 13:07:15 +0000 |
172 | @@ -15,7 +15,7 @@ |
173 | install_sources: | |
174 | - ${CI_PPA} |
175 | install_keys: | |
176 | - - "" |
177 | + - null |
178 | nagios_check_http_params: -H nfss -I 127.0.0.1 -e ' |
179 | 200 OK' --url='/api/v1/' -p 8080 |
180 | nagios_context: ci-airline-staging |
181 | |
182 | === modified file 'juju-deployer/ppa-creator.yaml.tmpl' |
183 | --- juju-deployer/ppa-creator.yaml.tmpl 2014-07-30 21:44:23 +0000 |
184 | +++ juju-deployer/ppa-creator.yaml.tmpl 2014-09-25 13:07:15 +0000 |
185 | @@ -12,8 +12,10 @@ |
186 | uid: root |
187 | install_sources: | |
188 | - ${CI_PPA} |
189 | + - "cloud:precise-icehouse" |
190 | install_keys: | |
191 | - - "" |
192 | + - null |
193 | + - null |
194 | ci-airline-rabbit: |
195 | branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server@47 |
196 | charm: rabbitmq |
197 | |
198 | === modified file 'juju-deployer/publisher.yaml.tmpl' |
199 | --- juju-deployer/publisher.yaml.tmpl 2014-07-30 08:06:59 +0000 |
200 | +++ juju-deployer/publisher.yaml.tmpl 2014-09-25 13:07:15 +0000 |
201 | @@ -12,8 +12,10 @@ |
202 | unit-config: include-base64://configs/unit_config.yaml |
203 | install_sources: | |
204 | - ${CI_PPA} |
205 | + - "cloud:precise-icehouse" |
206 | install_keys: | |
207 | - - "" |
208 | + - null |
209 | + - null |
210 | cron_cmd: ./run-python ./publisher/bin/check_worker.py |
211 | cron_schedule: "*/10 * * * *" |
212 | nagios_context: ci-airline-staging |
213 | |
214 | === modified file 'juju-deployer/test-runner.yaml.tmpl' |
215 | --- juju-deployer/test-runner.yaml.tmpl 2014-09-16 12:27:31 +0000 |
216 | +++ juju-deployer/test-runner.yaml.tmpl 2014-09-25 13:07:15 +0000 |
217 | @@ -12,8 +12,10 @@ |
218 | uid: root |
219 | install_sources: | |
220 | - ${CI_PPA} |
221 | + - "cloud:precise-icehouse" |
222 | install_keys: | |
223 | - - "" |
224 | + - null |
225 | + - null |
226 | cron_cmd: ./run-python ./test_runner/bin/check_worker.py |
227 | cron_schedule: "0 */2 * * *" |
228 | nagios_context: ci-airline-staging |
229 | |
230 | === modified file 'juju-deployer/ticket-system.yaml.tmpl' |
231 | --- juju-deployer/ticket-system.yaml.tmpl 2014-09-19 13:22:20 +0000 |
232 | +++ juju-deployer/ticket-system.yaml.tmpl 2014-09-25 13:07:15 +0000 |
233 | @@ -19,7 +19,7 @@ |
234 | install_sources: | |
235 | - ${CI_PPA} |
236 | install_keys: | |
237 | - - "" |
238 | + - null |
239 | ci-airline-ts-postgres: |
240 | #branch: lp:charms/precise/postgresql@101 |
241 | branch: lp:~joetalbott/charms/precise/postgresql/ensure_credentials_after_mount |
242 | |
243 | === modified file 'juju-deployer/validator.yaml.tmpl' |
244 | --- juju-deployer/validator.yaml.tmpl 2014-08-12 14:34:01 +0000 |
245 | +++ juju-deployer/validator.yaml.tmpl 2014-09-25 13:07:15 +0000 |
246 | @@ -12,8 +12,10 @@ |
247 | unit-config: include-base64://configs/unit_config.yaml |
248 | install_sources: | |
249 | - ${CI_PPA} |
250 | + - "cloud:precise-icehouse" |
251 | install_keys: | |
252 | - - "" |
253 | + - null |
254 | + - null |
255 | cron_cmd: ./run-python ./validator/bin/check_validator.py |
256 | cron_schedule: "*/10 * * * *" |
257 | nagios_context: ci-airline-staging |
258 | |
259 | === modified file 'juju-deployer/webui.yaml.tmpl' |
260 | --- juju-deployer/webui.yaml.tmpl 2014-07-17 21:46:59 +0000 |
261 | +++ juju-deployer/webui.yaml.tmpl 2014-09-25 13:07:15 +0000 |
262 | @@ -38,7 +38,7 @@ |
263 | install_sources: | |
264 | - ${CI_PPA} |
265 | install_keys: | |
266 | - - "" |
267 | + - null |
268 | ci-airline-webui-gunicorn: |
269 | branch: lp:charms/gunicorn@30 |
270 | charm: gunicorn |
PASSED: Continuous integration, rev:764 s-jenkins. ubuntu- ci:8080/ job/uci- engine- ci/1330/
http://
Executed test runs:
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/uci- engine- ci/1330/ rebuild
http://