| commit | d6a8e8b31d2acf0b5457ff6827978adfafb6c381 | [log] [tgz] |
|---|---|---|
| author | Vasyl Saienko <vsaienko@mirantis.com> | Thu Nov 15 09:59:43 2018 +0000 |
| committer | Gerrit Code Review <mail@domain.com> | Thu Nov 15 09:59:43 2018 +0000 |
| tree | b6f3ee3652d1a099d4852c4bd30d1a3a1e03fe9b | |
| parent | 69a6d02028ffdc5e5694db0edd27bad9bdb3a840 [diff] | |
| parent | 05e2a09926cb8a85d21ca2209d06b65653bb5098 [diff] |
Merge "Update Makefile configuration"
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?=""