Merge pull request #223 from myii/feat/use-saltimages-where-available

feat(kitchen): use `saltimages` Docker Hub where available
myii · Jun 15, 2020 · 9ba80a2 · 9ba80a2
2 parents 66d065d + 4fee507
commit 9ba80a2
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 6 deletions.
diff --git a/ssf/config/formulas.sls b/ssf/config/formulas.sls
@@ -136,6 +136,7 @@ prepare-git-branch-for-{{ formula }}:
         platforms_matrix_commented_includes: {{ context.platforms_matrix_commented_includes | yaml }}
         rubocop: {{ context.rubocop | yaml }}
         salt_lint: {{ context.salt_lint | yaml }}
+        saltimages: {{ ssf.saltimages | yaml }}
         script_kitchen: {{ context.script_kitchen | yaml }}
         shellcheck: {{ context.shellcheck | yaml }}
         suite: {{ suite | yaml }}

diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml
@@ -55,8 +55,8 @@ ssf_node_anchors:
             #       An alternative method could be to use:
             #       `git describe --abbrev=0 --tags`
             # yamllint disable rule:line-length rule:quoted-strings
-            title: "chore(gemfile.lock): update to latest gem versions [skip ci]"
-            body: '* Automated using https://github.com/myii/ssf-formula/pull/222'
+            title: "ci(kitchen): use '`'saltimages'`' Docker Hub where available [skip ci]"
+            body: '* Automated using https://github.com/myii/ssf-formula/pull/223'
             # yamllint enable rule:line-length rule:quoted-strings
           github:
             owner: 'saltstack-formulas'
@@ -289,6 +289,49 @@ ssf:
       create_PR:
         active: false
         source: 'salt://ssf/files/default/git/git_30_create_PR.sh'
+  saltimages:
+    ### `master-py3`
+    - [debian       ,  10   ,   master,      3]  # debi-10.0-master-py3
+    - [ubuntu       ,  20.04,   master,      3]  # ubun-20.0-master-py3
+    - [ubuntu       ,  18.04,   master,      3]  # ubun-18.0-master-py3
+    - [centos       ,   8   ,   master,      3]  # cent-08.0-master-py3
+    - [fedora       ,  32   ,   master,      3]  # fedo-32.0-master-py3
+    - [fedora       ,  31   ,   master,      3]  # fedo-31.0-master-py3
+    - [opensuse/leap,  15.2 ,   master,      3]  # opsu-15.2-master-py3
+    - [amazonlinux  ,   2   ,   master,      3]  # amaz-02.0-master-py3
+    - [oraclelinux  ,   8   ,   master,      3]  # orac-08.0-master-py3
+
+    ### `3000.3-py3`
+    - [debian       ,  10   ,   3000.3,      3]  # debi-10.0-3000.3-py3
+    - [debian       ,   9   ,   3000.3,      3]  # debi-09.0-3000.3-py3
+    - [ubuntu       ,  18.04,   3000.3,      3]  # ubun-18.0-3000.3-py3
+    - [centos       ,   8   ,   3000.3,      3]  # cent-08.0-3000.3-py3
+    - [centos       ,   7   ,   3000.3,      3]  # cent-07.0-3000.3-py3
+    - [fedora       ,  31   ,   3000.3,      3]  # fedo-31.0-3000.3-py3
+    - [opensuse/leap,  15.2 ,   3000.3,      3]  # opsu-15.2-3000.3-py3
+    - [amazonlinux  ,   2   ,   3000.3,      3]  # amaz-02.0-3000.3-py3
+    - [oraclelinux  ,   8   ,   3000.3,      3]  # orac-08.0-3000.3-py3
+    - [oraclelinux  ,   7   ,   3000.3,      3]  # orac-07.0-3000.3-py3
+    ### ` 3000.3-py2`
+    - [ubuntu       ,  18.04,   3000.3,      2]  # ubun-18.0-3000.3-py2
+    - [ubuntu       ,  16.04,   3000.3,      2]  # ubun-16.0-3000.3-py2
+    - [arch-base    , latest,   3000.3,      2]  # arch-late-3000.3-py2
+
+    ### `2019.2-py3`
+    - [debian       ,  10   ,   2019.2,      3]  # debi-10.0-2019.2-py3
+    - [debian       ,   9   ,   2019.2,      3]  # debi-09.0-2019.2-py3
+    - [ubuntu       ,  18.04,   2019.2,      3]  # ubun-18.0-2019.2-py3
+    - [ubuntu       ,  16.04,   2019.2,      3]  # ubun-16.0-2019.2-py3
+    - [centos       ,   8   ,   2019.2,      3]  # cent-08.0-2019.2-py3
+    - [centos       ,   7   ,   2019.2,      3]  # cent-07.0-2019.2-py3
+    - [fedora       ,  31   ,   2019.2,      3]  # fedo-31.0-2019.2-py3
+    - [opensuse/leap,  15.2 ,   2019.2,      3]  # opsu-15.2-2019.2-py3
+    - [amazonlinux  ,   2   ,   2019.2,      3]  # amaz-02.0-2019.2-py3
+    ### `2019.2-py2`
+    - [centos       ,   6   ,   2019.2,      2]  # cent-06.0-2019.2-py2
+    - [amazonlinux  ,   1   ,   2019.2,      2]  # amaz-01.0-2019.2-py2
+    - [arch-base    , latest,   2019.2,      2]  # arch-late-2019.2-py2
+
   semrel_formulas:
     apache: *formula_default
     apt:

diff --git a/ssf/files/default/kitchen.yml b/ssf/files/default/kitchen.yml
@@ -54,7 +54,7 @@
 {%-     if not pre_salted %}
 image: {{ os }}:{{ os_ver }}
 {%-     else %}
-image: netmanagers/salt-{{ salt_ver }}-py{{ py_ver }}:{{ os | replace('/', '-') }}-{{ os_ver }}
+image: {{ 'saltimages' if [os, os_ver, salt_ver, py_ver] in saltimages else 'netmanagers' }}/salt-{{ salt_ver }}-py{{ py_ver }}:{{ os | replace('/', '-') }}-{{ os_ver }}
 {%-     endif %}
 {%-   endfilter %}
 {%- endmacro %}

diff --git a/ssf/files/tofs_arvados-formula/kitchen.yml b/ssf/files/tofs_arvados-formula/kitchen.yml
@@ -14,16 +14,16 @@ platforms:
   ## SALT `3000.3`
   - name: debian-10-3000-3-py3
     driver:
-      image: netmanagers/salt-3000.3-py3:debian-10
+      image: saltimages/salt-3000.3-py3:debian-10
 
 #   - name: ubuntu-1804-3000-3-py3
 #     driver:
-#       image: netmanagers/salt-3000.3-py3:ubuntu-18.04
+#       image: saltimages/salt-3000.3-py3:ubuntu-18.04
 
 #   ## SALT `2019.2`
 #   - name: centos-7-2019-2-py3
 #     driver:
-#       image: netmanagers/salt-2019.2-py3:centos-7
+#       image: saltimages/salt-2019.2-py3:centos-7
 
 provisioner:
   name: salt_solo