Merge lp:~kwmonroe/charms/trusty/zulu8/promulgated-source into lp:~azulcharmers/charms/trusty/zulu8/source

[Kevin W Monroe]

This is the source branch that was used to build the Zulu8 charm available here:

https://jujucharms.com/zulu8/trusty/2

I noticed this is a few commits ahead of your lp:~azulcharmers/charms/trusty/zulu8/source branch, so I wanted to create this merge proposal to get your branch updated. Notable changes:

+ include tests in the layered source (these were in your ./trunk branch, but they need to live in the ./source branch since that is where 'charm build' will look for them when creating a deployable charm)

+ minor README and logging updates (I noticed 'set -x' was causing a tremendous amount of juju debug-log output, so I removed it in favor of appropriate 'juju-log' statements)

+ send relation data when zulu version changes after install (I noticed the new java version and JAVA_HOME were not getting set when up/downgrading zulu after initial install)

Let me know if you have any questions/concerns over any of this. I'm excited to have zulu8 in the charm store as an alternative to other java environments! Thanks.

=== added file 'Makefile'
--- Makefile	1970-01-01 00:00:00 +0000
+++ Makefile	2016-03-10 23:49:51 +0000
@@ -0,0 +1,8 @@
+#!/usr/bin/make
+PYTHON := /usr/bin/env python
+
+all: lint
+
+lint:
+	@flake8 --exclude hooks/charmhelpers hooks tests
+	@charm proof

=== modified file 'README.md'
--- README.md	2015-12-09 12:33:36 +0000
+++ README.md	2016-03-10 23:49:51 +0000
@@ -18,11 +18,11 @@
 At this point, Zulu is waiting for a relationship to some other service. This
 can be [any service](https://jujucharms.com/provides/java) that offers the
 `java` interface. Building off the previous step, here is a simple deployment
-scenario that would result in the Zulu JDK being installed on the `ubuntu-java`
-unit:
+scenario that would result in the Zulu JDK being installed on the
+`ubuntu-devenv` unit:
 
-    juju deploy ubuntu-java
-    juju add-relation ubuntu-java zulu8
+    juju deploy ubuntu-devenv
+    juju add-relation ubuntu-devenv zulu8
 
 The Zulu charm adds a public key for the Azul apt-get repository to your system,
 then installs Zulu-8 from it. The Zulu charm also sets Zulu-8 as default java

=== modified file 'reactive/install'
--- reactive/install	2015-12-04 12:27:52 +0000
+++ reactive/install	2016-03-10 23:49:51 +0000
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -ex
+set -e
 
 source charms.reactive.sh
 
@@ -25,6 +25,7 @@
     apt-add-repository "deb http://repos.azulsystems.com/ubuntu stable main"
 
     status-set maintenance "Installing Zulu ${java_major}"
+    juju-log "zulu8: installing zulu ${java_major}"
     apt-get update -q
     apt-get install -qqy zulu-${java_major}
     update_java_home
@@ -32,10 +33,11 @@
     # Send relation data
     java_home=$(readlink -f /usr/bin/java | sed "s:/bin/java::")
     java_version=$(java -version 2>&1 | grep -i version | head -1 | awk -F '"' {'print $2'})
-    relation_call --relation_name=java set_ready $java_home $java_version
+    relation_call --state=java.connected set_ready $java_home $java_version
 
     set_state 'java.installed'
     status-set active "Zulu ${java_major} installed"
+    juju-log "zulu8: zulu ${java_major} installed"
 }
 
 @when 'java.connected' 'java.installed'
@@ -48,14 +50,22 @@
     if [[ $java_major != $java_major_installed ]]; then
       #Let's remove all available Zulu versions to avoid using java and langtools from different packets
       status-set maintenance "Uninstalling all Zulu versions before installing new one"
+      juju-log "zulu8: uninstalling all zulu versions before installing new one"
       apt-get remove --purge -qqy zulu*
 
       #no need to add repo once again, so let's just install latest available package
       status-set maintenance "Installing Zulu ${java_major}"
+      juju-log "zulu8: installing zulu ${java_major}"
       apt-get install -qqy zulu-${java_major}
-
       update_java_home
+
+      # Send relation data
+      java_home=$(readlink -f /usr/bin/java | sed "s:/bin/java::")
+      java_version=$(java -version 2>&1 | grep -i version | head -1 | awk -F '"' {'print $2'})
+      relation_call --state=java.connected set_ready $java_home $java_version
+
       status-set active "Zulu ${java_major} installed"
+      juju-log "zulu8: zulu ${java_major} installed"
     fi
 }
 
@@ -64,11 +74,13 @@
 function uninstall() {
     # Uninstall all versions of Zulu
     status-set maintenance "Uninstalling all Zulu versions"
+    juju-log "zulu8: uninstalling all zulu versions"
     apt-get remove --purge -qqy zulu*
     update_java_home
 
     remove_state 'java.installed'
     status-set blocked "Zulu (all versions) uninstalled"
+    juju-log "zulu8: zulu (all versions) uninstalled"
 }
 
 reactive_handler_main

=== added directory 'tests'
=== added file 'tests/01-deploy.py'
--- tests/01-deploy.py	1970-01-01 00:00:00 +0000
+++ tests/01-deploy.py	2016-03-10 23:49:51 +0000
@@ -0,0 +1,33 @@
+#!/usr/bin/env python3
+
+import unittest
+import amulet
+
+
+class TestDeploy(unittest.TestCase):
+    """
+    Deployment test for the Zulu8 java charm.
+
+    This charm is subordinate and requires a principal that provides the
+    'java' relation. Use ubuntu-devenv and ensure java -version works.
+    """
+
+    @classmethod
+    def setUpClass(cls):
+        cls.d = amulet.Deployment(series='trusty')
+        cls.d.add('ubuntu-devenv', 'cs:~kwmonroe/trusty/ubuntu-devenv')
+        cls.d.add('zulu8', 'cs:trusty/zulu8')
+        cls.d.relate('ubuntu-devenv:java', 'zulu8:java')
+        cls.d.setup(timeout=900)
+        cls.d.sentry.wait(timeout=1800)
+        cls.unit = cls.d.sentry['ubuntu-devenv'][0]
+
+    def test_java(self):
+        cmd = "java -version 2>&1"
+        print("running {}".format(cmd))
+        output, rc = self.unit.run(cmd)
+        print("output from cmd: {}".format(output))
+        assert rc == 0, "Unexpected return code: {}".format(rc)
+
+if __name__ == '__main__':
+    unittest.main()

=== added file 'tests/tests.yaml'
--- tests/tests.yaml	1970-01-01 00:00:00 +0000
+++ tests/tests.yaml	2016-03-10 23:49:51 +0000
@@ -0,0 +1,2 @@
+packages:
+  - amulet