Add Salt 2018.3 tests

Change-Id: Ic32cd07f358c7e20951ffc3146c1c58ce709d398
aokiji · Jul 23, 2018 · 56feb35 · 56feb35
1 parent 33214c2
commit 56feb35
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 13 deletions.
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -30,7 +30,7 @@ provisioner:
 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
 
 verifier:

diff --git a/.travis.yml b/.travis.yml
@@ -17,9 +17,12 @@ install:
   - bundle install
 
 env:
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=single
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=single
-#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=single
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=single
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=single
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=single
+#    - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=single
+#    - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=single
+
 before_script:
   - set -o pipefail
   - make test | tail

diff --git a/helm/client_installed.sls b/helm/client_installed.sls
@@ -3,6 +3,11 @@
 include:
   - .kubectl_installed
 
+{%- set tar_opts = "- options: v" %}
+{%- if grains['saltversioninfo'] < [2016, 11] %}
+{%- set tar_opts = "- tar_options: v" %}
+{%- endif %}
+
 {%- set binary_source = "https://storage.googleapis.com/kubernetes-helm/helm-v" + 
                         config.version + "-" + config.flavor + ".tar.gz" %}
 
@@ -19,13 +24,10 @@ include:
     - archive_format: tar
     - user: root
     - group: root
-    {%- if grains['saltversioninfo'] < [2016, 11] %}
-    - tar_options: v
-    {%- else %}
-    - options: v
-    {%- endif %}
+    {{ tar_opts }}
     - onlyif:
-        - test "{{ config.version }}" = "canary" || test ! -e {{ constants.helm.tmp }}/{{ config.flavor }}/helm
+        - test "{{ config.version }}" -eq "canary" || test ! -e {{ constants.helm.tmp }}/{{ config.flavor }}/helm
+
 
 {{ config.bin }}:
   file.copy:

diff --git a/helm/repos_managed.sls b/helm/repos_managed.sls
@@ -6,7 +6,7 @@ include:
 {%- if "repos" in config %}
 repos_managed:
   helm_repos.managed:
-    - present: 
+    - present:
         {{ config.repos | yaml(false) | indent(8) }}
     - exclusive: true
     - helm_home: {{ config.helm_home }}

diff --git a/tests/pillar/single.sls b/tests/pillar/single.sls
@@ -15,8 +15,6 @@ helm:
           username: admin
           password: uberadminpass
         gce_service_token: anNvbl90b2tlbg==
-    repos:
-      mirantisworkloads: https://mirantisworkloads.storage.googleapis.com/
     releases:
       zoo1:
         enabled: false