commit 644a51876406587c027763d62a8bbf800c4862cb
author Martin Polreich <polreichmartin@gmail.com> Wed Nov 07 14:42:38 2018 +0100
committer Martin Polreich <polreichmartin@gmail.com> Wed Nov 07 17:36:04 2018 +0100
tree 9babe34264ca906f40546c38c899b5b1d23ff600
parent a0788a5831673e8c53f627ce75d231e72e4ace7f

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

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

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