| commit | 4ab61f4e12060756f3e5e1c0777d923c3c59adeb | [log] [tgz] |
|---|---|---|
| author | Martin Polreich <polreichmartin@gmail.com> | Wed Nov 07 14:42:40 2018 +0100 |
| committer | Martin Polreich <polreichmartin@gmail.com> | Wed Nov 07 14:42:40 2018 +0100 |
| tree | 9e2b57a93bacd610f5cd6e48a32e340f8891aa54 | |
| parent | ce6be15d91eb01b56b09de3394ed90daa21291b4 [diff] |
Update Makefile configuration Change-Id: I1f6d72fb68dc5bf7b18a5f8a835c347c56e2a155
diff --git a/Makefile b/Makefile index d166862..fb69046 100644 --- a/Makefile +++ b/Makefile
@@ -18,7 +18,11 @@ JOBS := 1 endif +ifeq (,$(wildcard ./.kitchen.openstack.yml)) +KITCHEN_LOCAL_YAML?=.kitchen.openstack.yml +else KITCHEN_LOCAL_YAML?=.kitchen.yml +endif KITCHEN_OPTS?="--concurrency=$(JOBS)" KITCHEN_OPTS_CREATE?="" KITCHEN_OPTS_CONVERGE?=""