From a041b9c31461b1eed4c3f58626856a2a7efe48b0 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 22 Sep 2019 17:45:36 +0100 Subject: [PATCH] feat(platform): add `arch-base-latest` * https://freenode.logbot.info/saltstack-formulas/20190922#c2679402 --- ssf/defaults.yaml | 12 ++++++-- ssf/files/default/kitchen.yml | 4 +-- ssf/formulas.yaml | 57 +++++++++++++++++++++++++++-------- 3 files changed, 56 insertions(+), 17 deletions(-) diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml index f29f905a..7dec6377 100644 --- a/ssf/defaults.yaml +++ b/ssf/defaults.yaml @@ -9,7 +9,7 @@ ssf_node_anchors: branch: # TODO: `base` can be removed in favour of `github:remote:upstream:branch` base: master - pr: chore/local-use-only-to-push-to-main-branch + pr: chore/standardise-structure upstream: upstream commit: # NOTE: The version number in the `body` is automatically updated during the @@ -17,8 +17,8 @@ ssf_node_anchors: # An alternative method could be to use: # `git describe --abbrev=0 --tags` # yamllint disable rule:line-length - title: 'ci(kitchen): change `log_level` to `debug` instead of `info`' - body: '* Automated using https://github.com/myii/ssf-formula/pull/41' + title: 'ci(platform): add `arch-base-latest`' + body: '* Automated using https://github.com/myii/ssf-formula/pull/40' # yamllint enable rule:line-length github: owner: saltstack-formulas @@ -55,6 +55,7 @@ ssf_node_anchors: - suse - freebsd - amazon + - arch provisioner: dependencies: [] # Structure assumes `top.sls:base` @@ -87,30 +88,35 @@ ssf_node_anchors: - [fedora , 30 , develop, 3] - [opensuse/leap, 15 , develop, 3] - [amazonlinux , 2 , develop, 2] + - [arch-base , latest, develop, 2] - [debian , 9 , 2019.2, 3] - [ubuntu , 18.04, 2019.2, 3] - [centos , 7 , 2019.2, 3] - [fedora , 30 , 2019.2, 3] - [opensuse/leap, 15 , 2019.2, 3] - [amazonlinux , 2 , 2019.2, 2] + - [arch-base , latest, 2019.2, 2] - [debian , 9 , 2018.3, 2] - [ubuntu , 16.04, 2018.3, 2] - [centos , 7 , 2018.3, 2] - [fedora , 29 , 2018.3, 2] - [opensuse/leap, 15 , 2018.3, 2] - [amazonlinux , 2 , 2018.3, 2] + - [arch-base , latest, 2018.3, 2] - [debian , 8 , 2017.7, 2] - [ubuntu , 16.04, 2017.7, 2] - [centos , 6 , 2017.7, 2] - [fedora , 29 , 2017.7, 2] - [opensuse/leap, 15 , 2017.7, 2] - [amazonlinux , 2 , 2017.7, 2] + - [arch-base , latest, 2017.7, 2] platforms_matrix: # Comments in `platforms` apply here, too # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , develop, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [amazonlinux , 2 , 2019.2, 2, default] + - [arch-base , latest, 2019.2, 2, default] - [fedora , 29 , 2018.3, 2, default] - [opensuse/leap, 15 , 2018.3, 2, default] - [centos , 6 , 2017.7, 2, default] diff --git a/ssf/files/default/kitchen.yml b/ssf/files/default/kitchen.yml index 33f77ea7..046e3c52 100644 --- a/ssf/files/default/kitchen.yml +++ b/ssf/files/default/kitchen.yml @@ -125,8 +125,8 @@ platforms: {%- endif %} {%- endif %} {#- TODO: Should really do this whole `if` block from `defaults.yaml` or `formulas.yaml`, just speeding things up right now #} - {%- if os == 'opensuse/leap' %} - {%- if semrel_formula == 'deepsea' and salt_ver != 'develop' %} + {%- if os in ['opensuse/leap', 'arch-base'] %} + {%- if os == 'opensuse/leap' and semrel_formula == 'deepsea' and salt_ver != 'develop' %} {#- Duplicated `provision_command` due to `deepsea`, try to remove eventually #} provision_command: - zypper -n in tar gzip diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index f0f117b3..98cb623c 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -117,15 +117,6 @@ ssf_node_anchors: - [fedora , 29 , 2018.3, 2, redhat] - [opensuse/leap, 15 , 2018.3, 2, suse] - [centos , 6 , 2017.7, 2, redhat] - # yamllint disable-line rule:line-length - platforms_matrix_osfamily_suites_without_amz: &platforms_matrix_osfamily_suites_without_amz - # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 10 , develop, 3, debian] - - [ubuntu , 18.04, 2019.2, 3, debian] - - [centos , 7 , 2019.2, 3, redhat] - - [fedora , 29 , 2018.3, 2, redhat] - - [opensuse/leap, 15 , 2018.3, 2, suse] - - [centos , 6 , 2017.7, 2, redhat] platforms_matrix_osfamily_debian: &platforms_matrix_osfamily_debian # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , develop, 3, default] @@ -140,6 +131,7 @@ ssf_node_anchors: - [ubuntu , 18.04, 2019.2, 3, default] - [centos , 7 , 2019.2, 3, default] # - [amazonlinux , 2 , 2019.2, 2, default] + - [arch-base , latest, 2019.2, 2, default] - [fedora , 29 , 2018.3, 2, default] - [opensuse/leap, 15 , 2018.3, 2, default] # - [centos , 6 , 2017.7, 2, default] @@ -349,6 +341,7 @@ ssf: - [ubuntu , 18.04, 2019.2, 3, default] - [centos , 7 , 2019.2, 3, default] # - [amazonlinux , 2 , 2019.2, 2, default] + # - [arch-base , latest, 2019.2, 2, default] - [fedora , 29 , 2018.3, 2, default] - [opensuse/leap, 15 , 2018.3, 2, default] - [centos , 6 , 2017.7, 2, default] @@ -387,24 +380,28 @@ ssf: # - [fedora , 30 , develop, 3, default] # - [opensuse/leap, 15 , develop, 3, default] # # - [amazonlinux , 2 , develop, 2, default] + # # - [arch-base , latest, develop, 2, default] - [debian , 9 , 2019.2, 3, default] # - [ubuntu , 18.04, 2019.2, 3, default] # - [centos , 7 , 2019.2, 3, default] - [fedora , 30 , 2019.2, 3, default] # # - [opensuse/leap, 15 , 2019.2, 3, default] # # - [amazonlinux , 2 , 2019.2, 2, default] + # # - [arch-base , latest, 2019.2, 2, default] # # - [debian , 9 , 2018.3, 2, default] # # - [ubuntu , 16.04, 2018.3, 2, default] - [centos , 7 , 2018.3, 2, default] # - [fedora , 29 , 2018.3, 2, default] - [opensuse/leap, 15 , 2018.3, 2, default] # # - [amazonlinux , 2 , 2018.3, 2, default] + # # - [arch-base , latest, 2018.3, 2, default] # # - [debian , 8 , 2017.7, 2, default] # # - [ubuntu , 16.04, 2017.7, 2, default] # # - [centos , 6 , 2017.7, 2, default] - [fedora , 29 , 2017.7, 2, default] # - [opensuse/leap, 15 , 2017.7, 2, default] # # - [amazonlinux , 2 , 2017.7, 2, default] + # # - [arch-base , latest, 2017.7, 2, default] use_tofs: true semrel_files: *semrel_files_default dhcpd: @@ -432,6 +429,7 @@ ssf: - [debian , 10 , develop, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [amazonlinux , 2 , 2019.2, 2, default] + # - [arch-base , latest, 2019.2, 2, default] - [centos , 7 , 2018.3, 2, default] # - [fedora , 29 , 2018.3, 2, default] - [opensuse/leap, 15 , 2018.3, 2, default] @@ -476,6 +474,7 @@ ssf: - [debian , 10 , develop, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] # - [amazonlinux , 2 , 2019.2, 2, default] + - [arch-base , latest, 2019.2, 2, default] - [fedora , 30 , 2019.2, 3, default] - [centos , 7 , 2018.3, 2, default] # - [fedora , 29 , 2018.3, 2, default] @@ -498,6 +497,7 @@ ssf: - [debian , 10 , develop, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [amazonlinux , 2 , 2019.2, 2, default] + # - [arch-base , latest, 2019.2, 2, default] - [debian , 9 , 2018.3, 2, default] - [fedora , 29 , 2018.3, 2, default] # - [opensuse/leap, 15 , 2018.3, 2, default] @@ -563,6 +563,7 @@ ssf: - [debian , 10 , develop, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [amazonlinux , 2 , 2019.2, 2, default] + - [arch-base , latest, 2019.2, 2, default] - [fedora , 29 , 2018.3, 2, default] - [centos , 7 , 2018.3, 2, default] # - [centos , 6 , 2017.7, 2, default] @@ -635,6 +636,7 @@ ssf: - [ubuntu , 18.04, 2019.2, 3, default] - [fedora , 30 , 2019.2, 3, default] # - [amazonlinux , 2 , 2019.2, 2, default] + # - [arch-base , latest, 2019.2, 2, default] - [centos , 7 , 2018.3, 2, default] # - [fedora , 29 , 2018.3, 2, default] - [opensuse/leap, 15 , 2018.3, 2, default] @@ -671,6 +673,7 @@ ssf: - [ubuntu , 18.04, 2019.2, 3, default] - [centos , 7 , 2019.2, 3, default] # - [amazonlinux , 2 , 2019.2, 2, default] + - [arch-base , latest, 2019.2, 2, default] - [fedora , 29 , 2018.3, 2, fedora] - [opensuse/leap, 15 , 2018.3, 2, default] - [centos , 6 , 2017.7, 2, default] @@ -741,6 +744,7 @@ ssf: - [ubuntu , 18.04, 2019.2, 3, default] - [centos , 7 , 2019.2, 3, default] # - [amazonlinux , 2 , 2019.2, 2, default] + - [arch-base , latest, 2019.2, 2, default] - [fedora , 29 , 2018.3, 2, default] - [opensuse/leap, 15 , 2018.3, 2, default] - [centos , 6 , 2017.7, 2, default] @@ -785,6 +789,7 @@ ssf: - [debian , 10 , develop, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [amazonlinux , 2 , 2019.2, 2, default] + # - [arch-base , latest, 2019.2, 2, default] - [centos , 7 , 2018.3, 2, default] # - [fedora , 29 , 2018.3, 2, default] - [opensuse/leap, 15 , 2018.3, 2, default] @@ -908,6 +913,8 @@ ssf: - [debian , 10 , develop, 3, default] - [centos , 7 , 2019.2, 3, default] - [fedora , 30 , 2019.2, 3, default] + # - [amazonlinux , 2 , 2019.2, 2, default] + # - [arch-base , latest, 2019.2, 2, default] - [ubuntu , 16.04, 2018.3, 2, default] - [opensuse/leap, 15 , 2018.3, 2, default] - [centos , 6 , 2017.7, 2, default] @@ -955,6 +962,8 @@ ssf: - [debian , 10 , develop, 3, default] - [centos , 7 , 2019.2, 3, default] - [fedora , 30 , 2019.2, 3, default] + # - [amazonlinux , 2 , 2019.2, 2, default] + # - [arch-base , latest, 2019.2, 2, default] - [debian , 9 , 2018.3, 2, default] - [ubuntu , 16.04, 2018.3, 2, default] - [centos , 6 , 2017.7, 2, default] @@ -999,7 +1008,14 @@ ssf: - debian - redhat - suse - platforms_matrix: *platforms_matrix_osfamily_suites_without_amz + platforms_matrix: + # [os , os_ver, salt_ver, py_ver, inspec_suite] + - [debian , 10 , develop, 3, debian] + - [ubuntu , 18.04, 2019.2, 3, debian] + - [centos , 7 , 2019.2, 3, redhat] + - [fedora , 29 , 2018.3, 2, redhat] + - [opensuse/leap, 15 , 2018.3, 2, suse] + - [centos , 6 , 2017.7, 2, redhat] use_cirrus_ci: true use_tofs: true semrel_files: *semrel_files_default @@ -1037,6 +1053,7 @@ ssf: - [centos , 7 , 2019.2, 2] - [opensuse/leap, 15 , 2019.2, 2] - [amazonlinux , 2 , 2019.2, 2] + - [arch-base , latest, 2019.2, 2] inspec_yml: summary: >- Verify that Salt `v201902-py2` is setup and configured @@ -1059,6 +1076,7 @@ ssf: # - [fedora , 29 , 2018.3, 2] # - [opensuse/leap, 15 , 2018.3, 2] - [amazonlinux , 2 , 2018.3, 2] + - [arch-base , latest, 2018.3, 2] inspec_yml: summary: >- Verify that Salt `v201803-py2` is setup and configured @@ -1081,6 +1099,7 @@ ssf: # - [fedora , 29 , 2017.7, 2] # - [opensuse/leap, 15 , 2017.7, 2] - [amazonlinux , 2 , 2017.7, 2] + - [arch-base , latest, 2017.7, 2] inspec_yml: summary: >- Verify that Salt `v201707-py2` is setup and configured @@ -1107,17 +1126,20 @@ ssf: # - [fedora , 29 , 2017.7, 2] # - [opensuse/leap, 15 , 2017.7, 2] - [amazonlinux , 2 , 2017.7, 2] + - [arch-base , latest, 2017.7, 2] - [debian , 9 , 2018.3, 2] - [ubuntu , 16.04, 2018.3, 2] - [centos , 7 , 2018.3, 2] # - [fedora , 29 , 2018.3, 2] # - [opensuse/leap, 15 , 2018.3, 2] - [amazonlinux , 2 , 2018.3, 2] + - [arch-base , latest, 2018.3, 2] - [debian , 9 , 2019.2, 2] - [ubuntu , 18.04, 2019.2, 2] - [centos , 7 , 2019.2, 2] - [opensuse/leap, 15 , 2019.2, 2] - [amazonlinux , 2 , 2019.2, 2] + - [arch-base , latest, 2019.2, 2] - [debian , 9 , 2019.2, 3] - [ubuntu , 18.04, 2019.2, 3] - [centos , 7 , 2019.2, 3] @@ -1131,17 +1153,20 @@ ssf: # # - [fedora , 29 , 2017.7, 2, v201707-py2] # # - [opensuse/leap, 15 , 2017.7, 2, v201707-py2] # - [amazonlinux , 2 , 2017.7, 2, v201707-py2] + # # - [arch-base , latest, 2017.7, 2, v201707-py2] # - [debian , 9 , 2018.3, 2, v201803-py2] # - [ubuntu , 16.04, 2018.3, 2, v201803-py2] - [centos , 7 , 2018.3, 2, v201803-py2] # # - [fedora , 29 , 2018.3, 2, v201803-py2] # # - [opensuse/leap, 15 , 2018.3, 2, v201803-py2] - [amazonlinux , 2 , 2018.3, 2, v201803-py2] + # # - [arch-base , latest, 2018.3, 2, v201803-py2] - [debian , 9 , 2019.2, 2, v201902-py2] - [ubuntu , 18.04, 2019.2, 2, v201902-py2] # - [centos , 7 , 2019.2, 2, v201902-py2] # - [opensuse/leap, 15 , 2019.2, 2, v201902-py2] # - [amazonlinux , 2 , 2019.2, 2, v201902-py2] + # # - [arch-base , latest, 2019.2, 2, v201902-py2] # - [debian , 9 , 2019.2, 3, v201902-py3] # - [ubuntu , 18.04, 2019.2, 3, v201902-py3] # - [centos , 7 , 2019.2, 3, v201902-py3] @@ -1262,6 +1287,7 @@ ssf: - [debian , 10 , develop, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [amazonlinux , 2 , 2019.2, 2, default] + - [arch-base , latest, 2019.2, 2, default] - [fedora , 29 , 2018.3, 2, default] - [opensuse/leap, 15 , 2018.3, 2, default] # - [centos , 6 , 2017.7, 2, default] @@ -1334,24 +1360,28 @@ ssf: - [fedora , 30 , develop, 3] - [opensuse/leap, 15 , develop, 3] - [amazonlinux , 2 , develop, 2] + - [arch-base , latest, develop, 2] - [debian , 9 , 2019.2, 3] - [ubuntu , 18.04, 2019.2, 3] - [centos , 7 , 2019.2, 3] - [fedora , 30 , 2019.2, 3] - [opensuse/leap, 15 , 2019.2, 3] - [amazonlinux , 2 , 2019.2, 2] + - [arch-base , latest, 2019.2, 2] - [debian , 9 , 2018.3, 2] - [ubuntu , 16.04, 2018.3, 2] - [centos , 7 , 2018.3, 2] - [fedora , 29 , 2018.3, 2] - [opensuse/leap, 15 , 2018.3, 2] - [amazonlinux , 2 , 2018.3, 2] + - [arch-base , latest, 2018.3, 2] - [debian , 8 , 2017.7, 2] - [ubuntu , 16.04, 2017.7, 2] # - [centos , 6 , 2017.7, 2] - [fedora , 29 , 2017.7, 2] - [opensuse/leap, 15 , 2017.7, 2] - [amazonlinux , 2 , 2017.7, 2] + - [arch-base , latest, 2017.7, 2] platforms_matrix: *platforms_matrix_systemd_only use_tofs: true semrel_files: *semrel_files_default @@ -1399,6 +1429,7 @@ ssf: - [debian , 10 , develop, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [amazonlinux , 2 , 2019.2, 2, default] + - [arch-base , latest, 2019.2, 2, default] - [fedora , 29 , 2018.3, 2, default] - [opensuse/leap, 15 , 2018.3, 2, default] - [centos , 6 , 2017.7, 2, centos6] @@ -1438,6 +1469,7 @@ ssf: - [centos , 7 , 2019.2, 3, default] - [fedora , 29 , 2018.3, 2, default] - [opensuse/leap, 15 , 2018.3, 2, default] + - [arch-base , latest, 2018.3, 2, default] - [ubuntu , 16.04, 2017.7, 2, default] travis: # Facing errors with `xenial` at time of adding @@ -1499,10 +1531,11 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , develop, 3, ''] - [ubuntu , 18.04, 2019.2, 3, ''] + - [fedora , 30 , 2019.2, 3, ''] - [amazonlinux , 2 , 2019.2, 2, ''] - - [fedora , 29 , 2018.3, 2, ''] + - [centos , 7 , 2018.3, 2, ''] - [opensuse/leap, 15 , 2018.3, 2, ''] - - [centos , 6 , 2017.7, 2, ''] + - [arch-base , latest, 2017.7, 2, ''] semrel_files: *semrel_files_default vim: context: