Merge lp:~pwlars/charms/trusty/jenkins-remote-slave/add-jenkins-creds into lp:~canonical-ci-engineering/charms/trusty/jenkins-remote-slave/trunk

Proposed by Paul Larson
Status: Merged
Merged at revision: 16
Proposed branch: lp:~pwlars/charms/trusty/jenkins-remote-slave/add-jenkins-creds
Merge into: lp:~canonical-ci-engineering/charms/trusty/jenkins-remote-slave/trunk
Diff against target: 16 lines (+12/-0)
1 file modified
hooks/install.d/5000-jenkins-creds (+12/-0)
To merge this branch: bzr merge lp:~pwlars/charms/trusty/jenkins-remote-slave/add-jenkins-creds
Reviewer Review Type Date Requested Status
Francis Ginther Approve
Review via email: mp+237888@code.launchpad.net

Description of the change

Add the jenkins-keys.yaml from secrets

To post a comment you must log in.
Revision history for this message
Francis Ginther (fginther) wrote :

Looks good. In the future if we need to push out an update creds file, an upgarde-charm should do the trick.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'hooks/install.d/5000-jenkins-creds'
2--- hooks/install.d/5000-jenkins-creds 1970-01-01 00:00:00 +0000
3+++ hooks/install.d/5000-jenkins-creds 2014-10-10 03:34:27 +0000
4@@ -0,0 +1,12 @@
5+#!/bin/sh
6+
7+# Install jenkins credentials so we can mark devices offline when they
8+# fail to recover automatically
9+set -ex
10+
11+install --owner=jenkins --group=jenkins -d \
12+ /var/lib/jenkins/.ubuntu-ci
13+
14+install --owner=jenkins --group=jenkins \
15+ files/secrets/jenkins-keys.yaml \
16+ /var/lib/jenkins/.ubuntu-ci/

Subscribers

People subscribed via source and target branches