From 4935b304a0f02d4f94aa159664099f88cc15035c Mon Sep 17 00:00:00 2001 From: Tim Gross Date: Tue, 28 Apr 2020 16:15:58 -0400 Subject: [PATCH] e2e: add helper to Makefile for local file deployments (#7822) --- e2e/terraform/Makefile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/e2e/terraform/Makefile b/e2e/terraform/Makefile index daaee7bad..cd1b4c8ea 100644 --- a/e2e/terraform/Makefile +++ b/e2e/terraform/Makefile @@ -1,4 +1,5 @@ NOMAD_SHA ?= $(shell git rev-parse HEAD) +PKG_PATH = $(shell pwd)/../../pkg/linux_amd64/nomad dev-cluster: terraform apply -auto-approve -var-file=terraform.tfvars.dev @@ -6,5 +7,11 @@ dev-cluster: cd .. && NOMAD_E2E=1 go test -v . -nomad.sha=$(NOMAD_SHA) -provision.terraform ./provisioning.json -skipTests terraform output message +dev-cluster-from-local: + terraform apply -auto-approve -var-file=terraform.tfvars.dev + terraform output provisioning | jq . > ../provisioning.json + cd .. && NOMAD_E2E=1 go test -v . -nomad.local_file=$(PKG_PATH) -provision.terraform ./provisioning.json -skipTests + terraform output message + clean: terraform destroy -auto-approve