Merge pull request #93 from myii/ci/use-amazon-develop-until-master-a…

…vailable feat(amazonlinux): use `develop` image until `master` is ready
myii · Nov 3, 2019 · f3dcbbe · f3dcbbe
2 parents 29b8913 + f7fb78d
commit f3dcbbe
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml
@@ -22,8 +22,8 @@ ssf_node_anchors:
             #       An alternative method could be to use:
             #       `git describe --abbrev=0 --tags`
             # yamllint disable rule:line-length
-            title: 'perf(travis): improve `salt-lint` invocation [skip ci]'
-            body: '* Automated using https://github.com/myii/ssf-formula/pull/90'
+            title: 'ci(kitchen): use `develop` image until `master` is ready (`amazonlinux`) [skip ci]'
+            body: '* Automated using https://github.com/myii/ssf-formula/pull/93'
             # yamllint enable rule:line-length
           github:
             owner: 'saltstack-formulas'

diff --git a/ssf/files/default/kitchen.yml b/ssf/files/default/kitchen.yml
@@ -50,6 +50,10 @@
 
 {%- macro format_driver_image(os, os_ver, salt_ver, py_ver) %}
 {%-   filter indent(6) %}
+{#-     Temporary use of `develop` instead of `master` until it is available #}
+{%-     if [os, os_ver, salt_ver] == ['amazonlinux', 2, 'master'] %}
+{%-       set salt_ver = 'develop' %}
+{%-     endif %}
 image: netmanagers/salt-{{ salt_ver }}-py{{ py_ver }}:{{ os | replace('/', '-') }}-{{ os_ver }}
 {%-   endfilter %}
 {%- endmacro %}
@@ -61,6 +65,10 @@ image: netmanagers/salt-{{ salt_ver }}-py{{ py_ver }}:{{ os | replace('/', '-')
 {%-     set prov_cmds = [] %}
 {#-     Specific to `master` #}
 {%-     if salt_ver == 'master' %}
+{#-       Temporary use of `develop` instead of `master` until it is available #}
+{%-       if [os, os_ver, salt_ver] == ['amazonlinux', 2, 'master'] %}
+{%-         set salt_ver = 'develop' %}
+{%-       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' %}
@@ -153,6 +161,10 @@ platforms:
   #     image: netmanagers/salt-2017.7-py2:centos-6
   #     run_command: /sbin/init
 {%-   else %}
+  {%-   if [os, os_ver, salt_ver] == ['amazonlinux', 2, 'master'] %}
+  # Use the `develop` image temporarily until the `master` image is available
+  # Not changing the name to minimise disruption across all of the formulas
+  {%-   endif %}
   - name: {{ os | replace('/', '-') }}-{{ os_ver | replace('.', '') }}-{{ salt_ver | replace('.', '-') }}-py{{ py_ver }}
     driver:
       {{- format_driver_image(os, os_ver, salt_ver, py_ver) }}