Merge ~pjdc/discourse-charm/+git/discourse-charm:use-stable-discourse into discourse-charm:master

[Paul Collins]

config.yaml: deploy Discourse from the stable branch by default

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

a6bb0d2... by Paul Collins on 2019-01-22

config.yaml: add ruby-version and bump from the layer's default of 2.4.2 to 2.4.4

Discourse stable branch requires at least Ruby 2.4.4.

[Tom Haddon (mthaddon)]

I'm not sure if it's related to your change, but I see this on the discourse unit for a related CI job:

2019-01-22 04:32:12 INFO juju-log db:3: Invoking reactive handler: reactive/discourse.py:135:prepare_codebase
2019-01-22 04:32:13 INFO juju-log db:3: Ruby error: ['LoadError: cannot load such file -- /usr/share/rubygems-integration/all/specifications/exe/rake', " /usr/local/bin/rake:23:in `load'", " /usr/local/bin/rake:23:in `<top (required)>'"]
2019-01-22 04:32:13 ERROR juju.worker.uniter.operation runhook.go:132 hook "db-relation-changed" failed: exit status 1
2019-01-22 04:32:13 INFO juju.worker.uniter resolver.go:124 awaiting error resolution for "relation-changed" hook

[Paul Collins (pjdc)]

> I'm not sure if it's related to your change, but I see this on the discourse
> unit for a related CI job:
>
> 2019-01-22 04:32:12 INFO juju-log db:3: Invoking reactive handler:
> reactive/discourse.py:135:prepare_codebase
> 2019-01-22 04:32:13 INFO juju-log db:3: Ruby error: ['LoadError: cannot load
> such file -- /usr/share/rubygems-integration/all/specifications/exe/rake', "
> /usr/local/bin/rake:23:in `load'", " /usr/local/bin/rake:23:in `<top
> (required)>'"]
> 2019-01-22 04:32:13 ERROR juju.worker.uniter.operation runhook.go:132 hook
> "db-relation-changed" failed: exit status 1
> 2019-01-22 04:32:13 INFO juju.worker.uniter resolver.go:124 awaiting error
> resolution for "relation-changed" hook

It's looking like the charm just does not work properly right now! I'm investigating.

[Paul Collins (pjdc)]

Already merged via another MP - rejecting.

Unmerged commits

a6bb0d2... by Paul Collins on 2019-01-22

config.yaml: add ruby-version and bump from the layer's default of 2.4.2 to 2.4.4

Discourse stable branch requires at least Ruby 2.4.4.

3c37a66... by Paul Collins on 2019-01-22

config.yaml: deploy Discourse from the stable branch by default

diff --git a/config.yaml b/config.yaml
index e5aefce..ae76780 100644
--- a/config.yaml
+++ b/config.yaml
@@ -7,6 +7,10 @@ options:
     type: string
     default: "/srv/discourse/current"
     description: "Path to the root of the ruby app."
+  commit-or-branch:
+    type: string
+    default: "stable"
+    description: "Branch to check out when deploying."
   repo:
     type: string
     default: "https://github.com/discourse/discourse.git"
@@ -19,6 +23,10 @@ options:
     type: string
     default: 'http://cache.ruby-lang.org/pub/ruby'
     description: "Default mirror to pull Ruby from, choose one closest to your datacenter."
+  ruby-version:
+    type: string
+    default: '2.4.4'
+    description: "Default Ruby version to install.  Choose a version sufficiently new for Discourse."
   admin-users:
     type: string
     default: ''