Merge lp:~psivaa/charms/trusty/jenkaas/install-jenkins into lp:~canonical-ci-engineering/charms/trusty/jenkaas/trunk

[Para Siva]

Install jenkins package from http://archive.admin.canonical.com/

Install jenkins package from files/ directory which should be downloaded from http://archive.admin.canonical.com/ by the mojo spec. As part of incremental MP's. This one is to install jenkins.

[Para Siva (psivaa)]

It looks like the 'deb' file needs to be downloaded and then installed here. Need to have a chat with IS about it.

[lp:~psivaa/charms/trusty/jenkaas/install-jenkins]

7. By Para Siva on 2015-06-12

Typo in config yaml

8. By Para Siva on 2015-06-12

Fix typo properly

[Francis Ginther (fginther)]

I think the dpkg call will fail as is (and from IRC, looks like you already ran into this). But I think this is the right approach overall.

review: Needs Fixing

[lp:~psivaa/charms/trusty/jenkaas/install-jenkins]

9. By Para Siva on 2015-06-15

Install dependency packages from jenkins ci

10. By Para Siva on 2015-06-15

jenkins ci deb line is not needed

11. By Para Siva on 2015-06-15

force install

12. By Para Siva on 2015-06-15

Charm name typo

13. By Para Siva on 2015-06-15

Install deps package with --fix-broken

14. By Para Siva on 2015-06-15

No need to setup admin user

[Para Siva (psivaa)]

Thanks Francis for the review and the information about missing symlinks. Rev 14 now installs jenkins and I was able to deploy this in wendigo. A re-review will be really helpful.

[Joe Talbott (joetalbott)]

One minor typo.

And a question. Is this charm going to always install the local deb or do I need to pass something in via the mojo spec to tell it to use the local deb? The charmstore version of jenkins takes the 'release' option, which when set to 'local' uses the local deb.

review: Needs Fixing

[Francis Ginther (fginther)]

> And a question. Is this charm going to always install the local deb or do I
> need to pass something in via the mojo spec to tell it to use the local deb?
> The charmstore version of jenkins takes the 'release' option, which when set
> to 'local' uses the local deb.

I vote for the answer being "This charm will only ever install a local .deb." and so there is no to specify any parameters of special logic for handling anything else. I think we can rely on IS always wanting to use a specific jenkins.deb package.

[Francis Ginther (fginther)]

I'd leave the charm name as 'jenkaas' (the one specified in the metafile) and also matches the trunk name. This charm is specific to our deployment and not a general purpose jenkins charm, so it makes sense to me to use a unique name.

Otherwise, looks good.

review: Needs Fixing

[lp:~psivaa/charms/trusty/jenkaas/install-jenkins]

15. By Para Siva on 2015-06-15

Review comment fixes, install as jenkaas, specify only local .deb are supported to install jenkins

[Para Siva (psivaa)]

Thanks again. I've fixed them in rev 15 and added a line in README for stating that it will be local deb that will be supported.

[Francis Ginther (fginther)]

Cool, looks good now.

review: Approve

[Francis Ginther (fginther)]

Oops, found a reference to create_admin_user() that was left in while trying to deploy a mojo spec.

review: Needs Fixing

[lp:~psivaa/charms/trusty/jenkaas/install-jenkins]

16. By Para Siva on 2015-06-16

Remove the removed function from services

[Para Siva (psivaa)]

So sorry about that. Forgot to removed it. Pushed it to rev 16

[lp:~psivaa/charms/trusty/jenkaas/install-jenkins]

17. By Para Siva on 2015-06-16

Change service name to jenkaas

18. By Para Siva on 2015-06-16

pyflakes and pep8

[Francis Ginther (fginther)]

Approve.

review: Approve

[Joe Talbott (joetalbott)]

Looks good. You found the other things that I discovered last night as well. Good job!

review: Approve

=== modified file 'README'
--- README	2015-06-11 17:19:34 +0000
+++ README	2015-06-16 08:35:02 +0000
@@ -13,4 +13,7 @@
 
 The charm expects the payload code to be provided as 
 files/jenkaas.tgz (a snapshot of lp:jenkaas) along
-with its corresponding files/pip-cache directory (python dependencies). 
+with its corresponding files/pip-cache directory (python dependencies).
+
+This charm will only ever install a local .deb provided under the files/
+directory.
 
=== modified file 'config.yaml'
--- config.yaml	2015-06-11 18:26:32 +0000
+++ config.yaml	2015-06-16 08:35:02 +0000
@@ -1,3 +1,5 @@
+options:
+  environment:
     default: "production"
     type: string
     description: |
 
=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-06-11 18:26:32 +0000
+++ hooks/actions.py	2015-06-16 08:35:02 +0000
@@ -4,18 +4,17 @@
 
 from charmhelpers import fetch
 from charmhelpers.core import hookenv
-from charmhelpers.core.host import adduser
-from charmhelpers.payload import (archive, execd)
+from charmhelpers.payload import execd
 
 SERVICE_NAME = 'jenkaas'
 SERVICE_CONFIGNAME = 'jenkaas.conf'
+DEPS_PKGES = ["daemon", "adduser", "psmisc", "default-jre"]
 
 config = hookenv.config()
 
 
 def _service_dir():
-    template = '/srv/{}/{}'
-    return template.format(config['environment'], SERVICE_NAME)
+    return '/var/lib/jenkins'
 
 
 def basenode(service_name):
@@ -26,12 +25,10 @@
 def log_start(service_name):
     hookenv.log('%s starting', SERVICE_NAME)
 
-def install_service_tarball(service_name):
-    files_dir = os.path.join(hookenv.charm_dir(), 'files')
-    tarball = os.path.join(files_dir, '{}.tgz'.format(SERVICE_NAME))
-    if not os.path.exists(_service_dir()):
-        hookenv.log('Installing the code for the first time from tarball')
-        archive.extract_tarfile(tarball, os.path.dirname(_service_dir()))
+
+def install_jenkins(service_name):
+    jenkins_deb = os.path.join(hookenv.charm_dir(), 'files/jenkins.deb')
+    subprocess.check_call(['dpkg', '-i', jenkins_deb])
 
 
 def update_config_file(service_name):
@@ -43,7 +40,7 @@
         f.write(config_content)
 
 
-def create_admin_user(service_name):
-    username = 'admin'
-    hookenv.log('Creating service user: %s', username)
-    adduser(username)
+def install_jenkins_dep_pkges(service_name):
+    hookenv.log('Installing dependency packages')
+    fetch.apt_update()
+    fetch.apt_install(DEPS_PKGES, options=['--fix-broken', ], fatal=True)
 
=== added symlink 'hooks/config-changed'
=== target is u'hooks.py'
=== added symlink 'hooks/install'
=== target is u'hooks.py'
=== modified file 'hooks/services.py'
--- hooks/services.py	2015-06-11 18:26:32 +0000
+++ hooks/services.py	2015-06-16 08:35:02 +0000
@@ -13,9 +13,9 @@
             'required_data': [config],
             'data_ready': [
                 actions.basenode,
-                actions.install_service_tarball,
+                actions.install_jenkins_dep_pkges,
+                actions.install_jenkins,
                 actions.update_config_file,
-                actions.create_admin_user,
                 helpers.render_template(
                     source='upstart.conf',
                     target='/etc/init/jenkaas.conf'),
 
=== added symlink 'hooks/start'
=== target is u'hooks.py'
=== added symlink 'hooks/stop'
=== target is u'hooks.py'
=== added symlink 'hooks/upgrade-charm'
=== target is u'hooks.py'