commit c9dadf793179ff5dbc10c1248c9c7388cea3c32f
author Martin Polreich <polreichmartin@gmail.com> Wed Apr 25 15:03:05 2018 +0200
committer Martin Polreich <polreichmartin@gmail.com> Wed Sep 19 11:04:26 2018 +0200
tree de9a52f7b3d095d5308604180befcdfa843d05ac
parent ddc9a92a8628ddda972886c2474479068234c835

Add Salt 2018.3 tests

Change-Id: Id7b6aa73d0131aca22283b2815abb18a360bf223

.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index d5424a6..7206d07 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -32,7 +32,7 @@
 platforms:
   - name: <%=ENV['PLATFORM'] ||  'saltstack-ubuntu-xenial-salt-stable' %>
     driver_config:
-      image: <%=ENV['PLATFORM'] || 'epcim/salt-formulas:saltstack-ubuntu-xenial-salt-stable'%>
+      image: <%=ENV['PLATFORM'] || 'epcim/salt:saltstack-ubuntu-xenial-salt-stable'%>
       platform: ubuntu
 
 suites:

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 7f907c9..8161fcc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,12 +20,16 @@
   - bundle install
 
 env:
-  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=alertmanager
-  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=server
-  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=alertmanager
-  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=server
-  # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=alertmanager
-  # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=server
+  - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=alertmanager
+  - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=server
+  - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=alertmanager
+  - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=server
+  - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-stable SUITE=alertmanager
+  - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-stable SUITE=server
+  # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=alertmanager
+  # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=server
+  # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-stable SUITE=alertmanager
+  # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-stable SUITE=server
 
 before_script:
   - set -o pipefail

tests/pillar/server.sls

diff --git a/tests/pillar/server.sls b/tests/pillar/server.sls
index 7b65e74..96228d6 100644
--- a/tests/pillar/server.sls
+++ b/tests/pillar/server.sls
@@ -36,12 +36,12 @@
           cert_name: prometheus-server.crt
           key_name: prometheus-server.key
           member:
-            - host: ${_param:cluster_node01_address}
-              port: ${_param:cluster_node01_port}
-            - host: ${_param:cluster_node02_address}
-              port: ${_param:cluster_node02_port}
-            - host: ${_param:cluster_node03_address}
-              port: ${_param:cluster_node03_port}
+            - host: 10.0.175.101
+              port: 4001
+            - host: 10.0.175.102
+              port: 4001
+            - host: 10.0.175.103
+              port: 4001
     recording:
       instance:fd_utilization:
         query: >-
@@ -68,7 +68,7 @@
       remote_write:
         remote_storage_adapter:
           enabled: true
-          url: http://127.0.0.1:9201/write
+          url: "http://127.0.0.1:9201/write"
       alertmanager:
         docker_swarm_alertmanager:
           enabled: true