From 06096ab37a2def4fc3d1bcb14d705357dede1093 Mon Sep 17 00:00:00 2001
From: bastjan <bastjan@users.noreply.github.com>
Date: Thu, 8 Jul 2021 12:52:08 +0000
Subject: [PATCH 1/2] Update from projectsyn/modulesync-control

---
 Makefile         | 3 ++-
 Makefile.vars.mk | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index afab1b33..d56fa98c 100644
--- a/Makefile
+++ b/Makefile
@@ -49,10 +49,11 @@ docs-serve: ## Preview the documentation
 
 .PHONY: compile
 .compile:
+	mkdir -p dependencies
 	$(COMMODORE_CMD)
 
 .PHONY: test
-test: commodore_args = -f tests/$(instance).yml
+test: commodore_args = -f tests/$(instance).yml --search-paths ./dependencies
 test: .compile ## Compile the component
 
 .PHONY: clean
diff --git a/Makefile.vars.mk b/Makefile.vars.mk
index 718599a2..94efba20 100644
--- a/Makefile.vars.mk
+++ b/Makefile.vars.mk
@@ -19,7 +19,7 @@ JSONNETFMT_ARGS ?= --in-place --pad-arrays
 JSONNET_IMAGE   ?= docker.io/bitnami/jsonnet:latest
 JSONNET_DOCKER  ?= $(DOCKER_CMD) $(DOCKER_ARGS) $(root_volume) --entrypoint=jsonnetfmt $(JSONNET_IMAGE)
 
-YAML_FILES      ?= $(shell find . -type f -not -path './vendor/*' \( -name '*.yaml' -or -name '*.yml' \))
+YAML_FILES      ?= $(shell find . -type f -not -regex './\(helmcharts\|manifests\|vendor\)/.*' \( -name '*.yaml' -or -name '*.yml' \))
 YAMLLINT_ARGS   ?= --no-warnings
 YAMLLINT_CONFIG ?= .yamllint.yml
 YAMLLINT_IMAGE  ?= docker.io/cytopia/yamllint:latest

From c70437598389474f3cbfbc7d210620dfa01ff6cb Mon Sep 17 00:00:00 2001
From: Sebastian Widmer <sebastian.widmer@vshn.net>
Date: Thu, 8 Jul 2021 15:33:06 +0200
Subject: [PATCH 2/2] Overriding output_path is no longer required for tests

---
 tests/builtin.yml  | 8 --------
 tests/external.yml | 8 --------
 2 files changed, 16 deletions(-)

diff --git a/tests/builtin.yml b/tests/builtin.yml
index ac651bf1..8c261ff7 100644
--- a/tests/builtin.yml
+++ b/tests/builtin.yml
@@ -1,10 +1,2 @@
 parameters:
   _instance: builtin
-  kapitan:
-    dependencies:
-      - type: helm
-        chart_name: keycloak
-        version: ${keycloak:charts:keycloak}
-        source: https://codecentric.github.io/helm-charts
-        # Need to overwrite this path:
-        output_path: /keycloak/helmcharts/keycloak/${keycloak:charts:keycloak}/
diff --git a/tests/external.yml b/tests/external.yml
index b76e13cf..c5249c81 100644
--- a/tests/external.yml
+++ b/tests/external.yml
@@ -1,13 +1,5 @@
 parameters:
   _instance: external
-  kapitan:
-    dependencies:
-      - type: helm
-        chart_name: keycloak
-        version: ${keycloak:charts:keycloak}
-        source: https://codecentric.github.io/helm-charts
-        # Need to overwrite this path:
-        output_path: /keycloak/helmcharts/keycloak/${keycloak:charts:keycloak}/
 
   keycloak:
     database: