Fold comments into Makefile.

Compact code and verify quotations happy inside bash and python.
Fix quotation marks. Very strange behavior
2025-12-19 12:51:28 +00:00 · 2023-01-31 12:47:17 -08:00 · 2023-01-27 16:53:10 -08:00 · 2023-01-27 14:40:41 -08:00 · 2023-01-27 14:35:30 -08:00 · 2023-01-26 15:56:12 -08:00
3 changed files with 28 additions and 13 deletions
--- a/.changes/unreleased/Features-20230126-154716.yaml
+++ b/.changes/unreleased/Features-20230126-154716.yaml
@@ -0,0 +1,6 @@
+kind: Features
+body: Adjust makefile to have clearer instructions for CI env var changes.
+time: 2023-01-26T15:47:16.887327-08:00
+custom:
+  Author: versusfacit
+  Issue: "6689"
--- a/.gitignore
+++ b/.gitignore
@@ -51,6 +51,7 @@ coverage.xml
 *,cover
 .hypothesis/
 test.env
+makefile.test.env
 *.pytest_cache/


--- a/34
+++ b/34
@@ -6,18 +6,26 @@ ifeq ($(USE_DOCKER),true)
 	DOCKER_CMD := docker-compose run --rm test
 endif

-LOGS_DIR := ./logs
+#
+# To override CI_flags, create a file at this repo's root dir named `makefile.test.env`. Fill it
+# with any ENV_VAR overrides required by your test environment, e.g.
+#    DBT_TEST_USER_1=user
+#    LOG_DIR="dir with a space in it"
+#
+# Warn: Restrict each line to one variable only.
+#
+ifeq (./makefile.test.env,$(wildcard ./makefile.test.env))
+	include ./makefile.test.env
+endif

-# Optional flag to invoke tests using our CI env.
-# But we always want these active for structured
-# log testing.
 CI_FLAGS =\
-	DBT_TEST_USER_1=dbt_test_user_1\
-	DBT_TEST_USER_2=dbt_test_user_2\
-	DBT_TEST_USER_3=dbt_test_user_3\
-	RUSTFLAGS="-D warnings"\
-	LOG_DIR=./logs\
-	DBT_LOG_FORMAT=json
+	DBT_TEST_USER_1=$(if $(DBT_TEST_USER_1),$(DBT_TEST_USER_1),dbt_test_user_1)\
+	DBT_TEST_USER_2=$(if $(DBT_TEST_USER_2),$(DBT_TEST_USER_2),dbt_test_user_2)\
+	DBT_TEST_USER_3=$(if $(DBT_TEST_USER_3),$(DBT_TEST_USER_3),dbt_test_user_3)\
+	RUSTFLAGS=$(if $(RUSTFLAGS),$(RUSTFLAGS),"-D warnings")\
+	LOG_DIR=$(if $(LOG_DIR),$(LOG_DIR),./logs)\
+	DBT_LOG_FORMAT=$(if $(DBT_LOG_FORMAT),$(DBT_LOG_FORMAT),json)
+

 .PHONY: dev_req
 dev_req: ## Installs dbt-* packages in develop mode along with only development dependencies.
@@ -66,7 +74,7 @@ test: .env ## Runs unit tests with py and code checks against staged changes.
 .PHONY: integration
 integration: .env ## Runs postgres integration tests with py-integration
 	@\
-	$(if $(USE_CI_FLAGS), $(CI_FLAGS)) $(DOCKER_CMD) tox -e py-integration -- -nauto
+	$(CI_FLAGS) $(DOCKER_CMD) tox -e py-integration -- -nauto

 .PHONY: integration-fail-fast
 integration-fail-fast: .env ## Runs postgres integration tests with py-integration in "fail fast" mode.
@@ -76,9 +84,9 @@ integration-fail-fast: .env ## Runs postgres integration tests with py-integrati
 .PHONY: interop
 interop: clean
 	@\
-	mkdir $(LOGS_DIR) && \
+	mkdir $(LOG_DIR) && \
 	$(CI_FLAGS) $(DOCKER_CMD) tox -e py-integration -- -nauto && \
-	LOG_DIR=$(LOGS_DIR) cargo run --manifest-path test/interop/log_parsing/Cargo.toml
+	LOG_DIR=$(LOG_DIR) cargo run --manifest-path test/interop/log_parsing/Cargo.toml

 .PHONY: setup-db
 setup-db: ## Setup Postgres database with docker-compose for system testing.
Author	SHA1	Message	Date
Mila Page	7e2cbb9254	Fold comments into Makefile.	2023-01-31 12:47:17 -08:00
Mila Page	ffb3e422a5	Compact code and verify quotations happy inside bash and python.	2023-01-27 16:53:10 -08:00
Mila Page	0304b61e7f	Fix quotation marks. Very strange behavior	2023-01-27 14:40:41 -08:00
Mila Page	fa423a4cec	Add documentation to discourage makefile edits but provide override tooling.	2023-01-27 14:35:30 -08:00
Mila Page	638e43f9c3	Fix a spelling error.	2023-01-26 15:56:12 -08:00
Mila Page	9c1ac3963d	Fix erroneous whitespace.	2023-01-26 15:50:52 -08:00
Mila Page	178edd82a4	Fix up PR for review	2023-01-26 15:47:27 -08:00
Mila Page	36b817344f	Add clearer directions for custom test suite vars in Makefile.	2023-01-26 15:43:22 -08:00