From b9db4f76a72e5bd447997d3d943b79f613a7636b Mon Sep 17 00:00:00 2001
From: Martin Polreich <polreichmartin@gmail.com>
Date: Wed, 7 Nov 2018 14:43:05 +0100
Subject: [PATCH] Update Gemfile and Makefile configuration   - One Gemfile for
 all formulas tests   - Update Makefile for OpenStack tests

Fixes: PROD-24408 (PROD:24408)
Change-Id: Ib83c1759cdbf76a1393d9310599e7ee44a4d280d
---
 .travis.yml | 12 +++---------
 Makefile    |  4 ++++
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c1fe4c9..d71e64a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,15 +9,9 @@ install:
   - pip install PyYAML
   - pip install virtualenv
   - |
-    test -e Gemfile || cat <<EOF > Gemfile
-    source 'https://rubygems.org'
-    gem 'rake'
-    gem 'test-kitchen'
-    gem 'kitchen-docker'
-    gem 'kitchen-inspec'
-    gem 'inspec', '<3.0.0'
-    #Version was frozen, because of issues in the version of inspec >3.0.0 -- see https://mirantis.jira.com/browse/PROD-24324 for more info
-    gem 'kitchen-salt', :git => 'https://github.com/salt-formulas/kitchen-salt.git'
+    if [ ! -e Gemfile ]; then
+       curl -s -o ./Gemfile 'https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas/salt-formulas-scripts.git;a=blob_plain;f=Gemfile;hb=refs/heads/master'
+    fi
   - bundle install
 
 env:
diff --git a/Makefile b/Makefile
index d166862..fb69046 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,11 @@ else
 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?=""
-- 
2.32.7