| commit | ee0fcf2f5c008066a6586348c168fa47478a9df9 | [log] [tgz] |
|---|---|---|
| author | Martin Polreich <polreichmartin@gmail.com> | Wed Nov 07 14:45:05 2018 +0100 |
| committer | Martin Polreich <polreichmartin@gmail.com> | Wed Nov 07 14:45:05 2018 +0100 |
| tree | c9d3ab5ce43bccf46d769dcc04fb2bbb24d1dff8 | |
| parent | a0148f6e169b2553ca4a96a8b5a8dc2bd937efde [diff] |
Update Makefile configuration Change-Id: I265f30dc2f9f47f6ea6538eacb3c5ae0b38b4624
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?=""