commit | 52643a8d77852eb290cf2b48d82e7ae72fb3fbc4 | [log] [tgz] |
---|---|---|
author | Martin Polreich <polreichmartin@gmail.com> | Wed Nov 07 14:45:22 2018 +0100 |
committer | Martin Polreich <polreichmartin@gmail.com> | Wed Nov 07 14:45:22 2018 +0100 |
tree | d0de020de0e7e69d4bbf29f861f7d1f3b1daca6c | |
parent | ed34764dc7ab3f7422904ab182a7e68306859a72 [diff] |
Update Makefile configuration Change-Id: I38f4634406309b23bf815f2c5d0ab45ab394110e
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?=""