ci(travis): update travis tests

saltstack-formulas · May 10, 2020 · 5e356be · 5e356be
1 parent 583bdec
commit 5e356be
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -96,7 +96,7 @@ jobs:
     # - env: INSTANCE=default-amazonlinux-2-2019-2-py3
     # - env: INSTANCE=default-centos-6-2019-2-py2
     # - env: INSTANCE=default-amazonlinux-1-2019-2-py2
-    - env: INSTANCE=arch-arch-base-latest-2019-2-py2
+    - env: INSTANCE=default-arch-base-latest-2019-2-py2
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'

diff --git a/kitchen.yml b/kitchen.yml
@@ -232,7 +232,7 @@ platforms:
 
 provisioner:
   name: salt_solo
-  # log_level: debug
+  log_level: debug
   salt_install: none
   require_chef: false
   formula: kubernetes
@@ -254,7 +254,7 @@ suites:
       state_top:
         base:
           '*':
-            - kubernetes.clean
+            # kubernetes.clean
             - kubernetes
       pillars:
         top.sls:
@@ -271,7 +271,7 @@ suites:
       state_top:
         base:
           '*':
-            - kubernetes.clean
+            # kubernetes.clean
             - kubernetes
       pillars:
         top.sls:
@@ -288,7 +288,7 @@ suites:
       state_top:
         base:
           '*':
-            - kubernetes.clean
+            # kubernetes.clean
             - kubernetes
       pillars:
         top.sls:

diff --git a/kubernetes/minikube/config/environ/install.sls b/kubernetes/minikube/config/environ/install.sls
@@ -4,17 +4,17 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import kubernetes as k8s with context %}
-{%- set sls_binary_clean = tplroot ~ '.minikube.binary.clean' %}
-{%- set sls_package_clean = tplroot ~ '.minikube.package.clean' %}
-{%- set sls_source_clean = tplroot ~ '.minikube.source.clean' %}
+{%- set sls_binary_install = tplroot ~ '.minikube.binary' %}
+{%- set sls_package_install = tplroot ~ '.minikube.package' %}
+{%- set sls_source_install = tplroot ~ '.minikube.source' %}
 
     {%- if 'environ' in k8s.minikube and k8s.minikube.environ %}
         {%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
 
 include:
-  - {{ sls_binary_clean }}
-  - {{ sls_package_clean }}
-  - {{ sls_source_clean }}
+  - {{ sls_binary_install }}
+  - {{ sls_package_install }}
+  - {{ sls_source_install }}
 
 k8s-minikube-config-file-file-managed-environ_file:
   file.managed:
@@ -31,8 +31,8 @@ k8s-minikube-config-file-file-managed-environ_file:
     - context:
         environ: {{ k8s.minikube.environ|json }}
     - require:
-      - sls: {{ sls_binary_clean }}
-      - sls: {{ sls_package_clean }}
-      - sls: {{ sls_source_clean }}
+      - sls: {{ sls_binary_install }}
+      - sls: {{ sls_package_install }}
+      - sls: {{ sls_source_install }}
 
     {%- endif %}
diff --git a/kubernetes/minikube/config/file/install.sls b/kubernetes/minikube/config/file/install.sls
@@ -12,9 +12,9 @@
         {%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
 
 include:
-  {{ '- ' + sls_package_clean if k8s.minikube.pkg.use_upstream_repo else '' }}
-  {{ '- ' + sls_source_clean if k8s.minikube.pkg.use_upstream_source else '' }}
-  {{ '- ' + sls_binary_clean if k8s.minikube.pkg.use_upstream_binary else '' }}
+  {{ '- ' + sls_package_install if k8s.minikube.pkg.use_upstream_repo else '' }}
+  {{ '- ' + sls_source_install if k8s.minikube.pkg.use_upstream_source else '' }}
+  {{ '- ' + sls_binary_install if k8s.minikube.pkg.use_upstream_binary else '' }}
 
 k8s-minikube-config-file-install-file-managed:
   file.managed: