commit 21b54fe92eec60dd95b9c16d56fbedebfb6c5073
author Martin Polreich <polreichmartin@gmail.com> Wed Nov 07 14:44:48 2018 +0100
committer Martin Polreich <polreichmartin@gmail.com> Wed Nov 07 17:38:13 2018 +0100
tree 4a1170f2df1e2a98e80bb937d1987f1cef5809d8
parent a06e1fd69ab695b22dc8e7c9e01b4c08dd00ca49

Update Gemfile and Makefile configuration
  - One Gemfile for all formulas tests
  - Update Makefile for OpenStack tests

Fixes: PROD-24408 (PROD:24408)
Change-Id: Iac85717b9abc970bf72ee3233e68faa7dab3369c

Makefile

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?=""