revert(kitchen): "use bootstrapped opensuse images until 2019.2.2"

This reverts commit 25946b0.
myii · Oct 25, 2019 · 5e88b44 · 5e88b44
1 parent f1adcaf
commit 5e88b44
Showing 1 changed file with 2 additions and 19 deletions.
diff --git a/ssf/files/default/kitchen.yml b/ssf/files/default/kitchen.yml
@@ -50,11 +50,7 @@
 
 {%- macro format_driver_image(os, os_ver, salt_ver, py_ver) %}
 {%-   filter indent(6) %}
-{%-     if os == 'opensuse/leap' %}
-image: {{ os }}:{{ os_ver }}
-{%-     else %}
 image: netmanagers/salt-{{ salt_ver }}-py{{ py_ver }}:{{ os | replace('/', '-') }}-{{ os_ver }}
-{%-     endif %}
 {%-   endfilter %}
 {%- endmacro %}
 
@@ -63,20 +59,10 @@ image: netmanagers/salt-{{ salt_ver }}-py{{ py_ver }}:{{ os | replace('/', '-')
 {#-         Need to look at if this can be resolved from within the formulas themselves, though                               #}
 {%-   filter indent(6) %}
 {%-     set prov_cmds = [] %}
-{#-     Specific to unsalted `opensuse/leap` #}
-{%-     if os == 'opensuse/leap' %}
-{%-       do prov_cmds.append('# yamllint disable-line rule:line-length') %}
-{%-       do prov_cmds.append(
-            '- zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python{0}-pip'.format(py_ver)
-          ) %}
-{%-       do prov_cmds.append('- systemctl enable sshd.service') %}
-{%-     endif %}
 {#-     Specific to `master` #}
 {%-     if salt_ver == 'master' %}
-{%-       if os != 'opensuse/leap' %}
-{%-         do prov_cmds.append('- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com') %}
-{%-         do prov_cmds.append('- sh bootstrap-salt.sh -XdPbfrq -x python{0} git {1}'.format(py_ver, salt_ver)) %}
-{%-       endif %}
+{%-       do prov_cmds.append('- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com') %}
+{%-       do prov_cmds.append('- sh bootstrap-salt.sh -XdPbfrq -x python{0} git {1}'.format(py_ver, salt_ver)) %}
 {%-       if semrel_formula == 'deepsea' %}
 {%-         if os in ['centos', 'fedora'] %}
 {%-           do prov_cmds.append('- yum install make -y') %}
@@ -173,9 +159,6 @@ platforms:
       {{- format_driver_prov_cmds(os, os_ver, salt_ver, py_ver) }}
       {{- format_driver_run_cmds(os, os_ver) }}
     {%- if [os, os_ver] == ['opensuse/leap', 15] %}
-    provisioner:
-      salt_bootstrap_options: -XdPfrq -x python{{ py_ver }} git {{ salt_ver }}
-      salt_install: bootstrap
     # Workaround to avoid intermittent failures on `opensuse-leap-15`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport: