commit e48f98908fd42e34986e0dd903b629ea2645bc50
author Martin Polreich <polreichmartin@gmail.com> Wed Nov 07 14:44:25 2018 +0100
committer Martin Polreich <polreichmartin@gmail.com> Wed Nov 14 17:02:21 2018 +0100
tree 463bb49bf0653ebf1b83b008e1b8b002a55c1f2c
parent 5ff60421a6c6b318aeb2ca68d5603084fc8210b6

Update Gemfile and Makefile configuration
  - One Gemfile for all formulas tests
  - Update Makefile for OpenStack tests
  - No kitchen tests for oslo-templates formula

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

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 82a1477..2ffe067 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,20 +11,14 @@
   - 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:
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=default
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=default
 #    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7
 
 before_script: