Merge ~vultaire/charm-graylog:makefile-reworks into ~graylog-charmers/charm-graylog:master

[Paul Goins]

Rework Makefile for deprecated settings

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

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

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

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

[Xav Paice (xavpaice)]

can we please get this rebased against master? Lots of merge conflicts at present.

review: Needs Fixing

[Xav Paice (xavpaice)]

Tested, failing to connect to port 9001 for graylog3 which is known, and fixed in a later MP. LGTM otherwise, approving.

review: Approve

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

Change has no commit message, setting status to needs review.

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

Change successfully merged at revision 5a7990ff5200455b399237aa85e772fb133482be

diff --git a/Makefile b/Makefile
index ded904d..c713ed5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,10 @@
-BUILDDEST:=$(if $(JUJU_REPOSITORY),$(JUJU_REPOSITORY),"../graylog-built")
-BUILTCHARMDIR:="$(BUILDDEST)/builds/graylog"
+# Set charm build directory via CHARM_BUILD_DIR.
+# JUJU_REPOSITORY is here purely for backwards compatibility.
+# If not specified, CHARM_BUILD_DIR will default to ../graylog-built/builds
+
+JUJU_REPOSITORY:=$(if $(JUJU_REPOSITORY),$(JUJU_REPOSITORY),../graylog-built)
+CHARM_BUILD_DIR:=$(if $(CHARM_BUILD_DIR),$(CHARM_BUILD_DIR),$(JUJU_REPOSITORY)/builds)
+BUILTCHARMDIR:=$(CHARM_BUILD_DIR)/graylog
 
 all: unittest
 
@@ -36,12 +41,12 @@ unittest: sysdeps lint
 
 .PHONY: charmbuild
 charmbuild:
-	charm build --output-dir $(BUILDDEST) --report --force
+	CHARM_BUILD_DIR="$(CHARM_BUILD_DIR)" charm build --report --force
 
 .PHONY: functional
 functional: charmbuild
 	@echo "Running functional tests..."
-	@tox -e func
+	@CHARM_BUILD_DIR="$(CHARM_BUILD_DIR)" tox -e func
 
 .PHONY: charmrelease
 charmrelease:
diff --git a/tests/README.md b/tests/README.md
index 50a965f..5c8697d 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -1,7 +1,8 @@
 # How to run functional tests
 
-1. export JUJU_REPOSITORY=<directory for built charms>
-2. Optional: export MODEL_SETTINGS=<semicolon-separated list of "juju model-config" settings>
+1. export CHARM_BUILD_DIR=<directory for built charms>
+2. Optional: export MODEL_SETTINGS=<semicolon-separated list of
+   "juju model-config" settings>
 3. From the repository root, run: make test
 
 NOTE: If you are behind a proxy, be sure to export a MODEL_SETTINGS variable as
diff --git a/tests/__init__.py b/tests/__init__.py
index 9abea7a..d7058c8 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -8,6 +8,6 @@ def _add_path(path):
         sys.path.insert(1, path)
 
 
-built_charm = pathlib.Path(os.environ["JUJU_REPOSITORY"]) / "builds/graylog"
+built_charm = pathlib.Path(os.environ["CHARM_BUILD_DIR"]) / "graylog"
 # Need to avoid importing c.l.graylog as it wants charmhelpers etc.
 _add_path(str(built_charm / "lib/charms/layer/graylog"))
diff --git a/tests/bundles/overlays/local-charm-overlay.yaml.j2 b/tests/bundles/overlays/local-charm-overlay.yaml.j2
index d74aac1..e78574f 100644
--- a/tests/bundles/overlays/local-charm-overlay.yaml.j2
+++ b/tests/bundles/overlays/local-charm-overlay.yaml.j2
@@ -1,3 +1,3 @@
 applications:
   {{ charm_name }}:
-    charm: "{{ JUJU_REPOSITORY }}/builds/{{ charm_name }}"
+    charm: "{{ CHARM_BUILD_DIR }}/{{ charm_name }}"
diff --git a/tox.ini b/tox.ini
index a44fa4a..09f7d69 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,7 +19,7 @@ commands = functest-run-suite --keep-model
 deps = -r{toxinidir}/tests/requirements.txt
 passenv =
   HOME
-  JUJU_REPOSITORY
+  CHARM_BUILD_DIR
   MODEL_SETTINGS
 
 [testenv:lint]