Merge ~rahdjoudj/discourse-charm/+git/discourse-charm:discourse-charm into discourse-charm:master

[Reda Ahdjoudj]

Bug Fix(1855216): adding wheelhouse - update ruby default version - add brotli compression package to layer

adding psutil to wheelhouse so it's present in venv, since system package are not used.

Update default ruby version to be compatible with current discourse.

Add Brotli compression library to layer.yaml packages list as it's needed by discourse.

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

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

[Stuart Bishop (stub)]

Per inline comments, a few points to justify or tweak before landing.

review: Needs Information

[Reda Ahdjoudj (rahdjoudj)]

> Per inline comments, a few points to justify or tweak before landing.

Made the tweaks. Left the git add as I'm not sure of why it's in there.

[Stuart Bishop (stub)]

Yup

review: Approve

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

Change cannot be self approved, setting status to needs review.

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

Change must be approved by a member of one of the following teams:
 - discourse-charmers
Setting status to needs review.

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

Change successfully merged at revision 70f7f14b81528c205e773dcf10ccf33cc7718862

diff --git a/Makefile b/Makefile
index b612804..9a67e0a 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ LAYER_BRANCH := master
 DEVEL_BRANCH := test-built
 STABLE_BRANCH := built
 
-BUILD_DIR := $(JUJU_REPOSITORY)/builds/$(CHARM_NAME)
+BUILD_DIR := $(CHARM_DIR)/builds
 CHARM_STORE_URL := $(CHARM_NAME)
 
 SHELL := /bin/bash
@@ -47,25 +47,24 @@ $(BUILD_DIR):
 # from the working tree including all untracked and uncommitted
 # updates.
 .PHONY: build
-build: | $(BUILD_DIR)
-	charm build -f -o $(JUJU_REPOSITORY) -n $(CHARM_NAME)
+build: charm build -f -o $(BUILD_DIR)
 
 
-# Generate a fresh development build and commit it to $(TEST_BRANCH).
+# Generate a fresh development build and commit it to $(DEVEL_BRANCH).
 # Only builds work committed to $(LAYER_BRANCH).
 .PHONY: dev-build
-build-dev: | $(BUILD_DIR)
+build-dev:
 	-cd $(BUILD_DIR) && git merge --abort
 	cd $(BUILD_DIR) \
-	    && git reset --hard $(TEST_BRANCH) \
+	    && git reset --hard $(DEVEL_BRANCH) \
 	    && git clean -fxd \
 	    && git merge --log --no-commit -s ours \
 	    -m "charm-build of $(LAYER_BRANCH)" $(LAYER_BRANCH)
 	rm -rf .tmp-repo
 	git clone -b $(LAYER_BRANCH) . .tmp-repo
-	charm build -f -o $(JUJU_REPOSITORY) -n $(CHARM_NAME) .tmp-repo
+	charm build -f -o $(BUILD_DIR) .tmp-repo
 	rm -rf .tmp-repo
-	cd $(BUILD_DIR) && git add . 
+	cd $(BUILD_DIR) && git add .
 	-cd $(BUILD_DIR) && git commit --no-edit
 
 
diff --git a/config.yaml b/config.yaml
index b3366a8..e3c9261 100644
--- a/config.yaml
+++ b/config.yaml
@@ -21,7 +21,7 @@ options:
     description: "Default mirror to pull Ruby from, choose one closest to your datacenter."
   ruby-version:
     type: string
-    default: '2.4.4'
+    default: '2.6.5'
     description: "Default Ruby version to install.  Choose a version sufficiently new for Discourse."
   admin-users:
     type: string
diff --git a/layer.yaml b/layer.yaml
index c3d5c9a..98ca04d 100644
--- a/layer.yaml
+++ b/layer.yaml
@@ -1,4 +1,4 @@
-includes: 
+includes:
   - 'layer:ruby'
   - 'layer:git-deploy'
   - 'interface:pgsql'
@@ -16,7 +16,7 @@ options:
       - gifsicle
       - libpq-dev
       - redis-server
-      - python3-psutil
+      # - python3-psutil
       - postfix
       - postgresql-client-common
       - postgresql-client
@@ -26,6 +26,7 @@ options:
       # Ubuntu) or else an as yet nonexistent version of 3.x or later
       # that supports ES6 or at least "const" out of the box.
       - node-uglify
+      - brotli
   git-deploy:
     target: /srv/discourse
 repo: 'https://git.launchpad.net/discourse-charm'
diff --git a/wheelhouse.txt b/wheelhouse.txt
new file mode 100644
index 0000000..686138b
--- /dev/null
+++ b/wheelhouse.txt
@@ -0,0 +1 @@
+psutil>=5.4.2,<6.0.0