From 75a4ea698ffda7aa5b6b534ae1cdd30c99f28e66 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 14 May 2020 15:23:15 +0100 Subject: [PATCH] feat(formulas): adjust `platforms_new` to add `3000.3` * Use `:%s:\(3000.\)2:\13:` in `formulas.yaml` (and custom TOFS files) --- ssf/defaults.yaml | 4 +- ssf/files/tofs_arvados-formula/.travis.yml | 10 +- ssf/files/tofs_arvados-formula/kitchen.yml | 10 +- ssf/formulas.yaml | 156 ++++++++++----------- 4 files changed, 90 insertions(+), 90 deletions(-) diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml index 1e4defd4..bbdfd8be 100644 --- 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(semantic-release): standardise structure after PR #79 [skip ci]" - body: '* Automated using https://github.com/myii/ssf-formula/pull/184' + title: "ci(kitchen+travis): adjust matrix to add '`'3000.3'`' [skip ci]" + body: '* Automated using https://github.com/myii/ssf-formula/pull/185' # yamllint enable rule:line-length rule:quoted-strings github: owner: 'saltstack-formulas' diff --git a/ssf/files/tofs_arvados-formula/.travis.yml b/ssf/files/tofs_arvados-formula/.travis.yml index b1318c9c..da56128b 100644 --- a/ssf/files/tofs_arvados-formula/.travis.yml +++ b/ssf/files/tofs_arvados-formula/.travis.yml @@ -58,11 +58,11 @@ jobs: ## Define the rest of the matrix based on Kitchen testing # Make sure the instances listed below match up with # the `platforms` defined in `kitchen.yml` - - env: INSTANCE=api-debian-10-3000-2-py3 - - env: INSTANCE=workbench-debian-10-3000-2-py3 - - env: INSTANCE=shell-debian-10-3000-2-py3 - - env: INSTANCE=keepstore-debian-10-3000-2-py3 - # - env: INSTANCE=default-ubuntu-1804-3000-2-py3 + - env: INSTANCE=api-debian-10-3000-3-py3 + - env: INSTANCE=workbench-debian-10-3000-3-py3 + - env: INSTANCE=shell-debian-10-3000-3-py3 + - env: INSTANCE=keepstore-debian-10-3000-3-py3 + # - env: INSTANCE=default-ubuntu-1804-3000-3-py3 # - env: INSTANCE=default-centos-7-2019-2-py3 ## Define the release stage that runs `semantic-release` diff --git a/ssf/files/tofs_arvados-formula/kitchen.yml b/ssf/files/tofs_arvados-formula/kitchen.yml index e7cec4e5..4bf5c793 100644 --- a/ssf/files/tofs_arvados-formula/kitchen.yml +++ b/ssf/files/tofs_arvados-formula/kitchen.yml @@ -11,14 +11,14 @@ driver: # Make sure the platforms listed below match up with # the `env.matrix` instances defined in `.travis.yml` platforms: - ## SALT `3000.2` - - name: debian-10-3000-2-py3 + ## SALT `3000.3` + - name: debian-10-3000-3-py3 driver: - image: netmanagers/salt-3000.2-py3:debian-10 + image: netmanagers/salt-3000.3-py3:debian-10 -# - name: ubuntu-1804-3000-2-py3 +# - name: ubuntu-1804-3000-3-py3 # driver: -# image: netmanagers/salt-3000.2-py3:ubuntu-18.04 +# image: netmanagers/salt-3000.3-py3:ubuntu-18.04 # ## SALT `2019.2` # - name: centos-7-2019-2-py3 diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index d370ec91..ba992edc 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -68,19 +68,19 @@ ssf_node_anchors: - [opensuse/leap, 15.1 , master, 3] - [amazonlinux , 2 , master, 3] - ### `3000.2-py3` - - [debian , 10 , 3000.2, 3] - - [debian , 9 , 3000.2, 3] - - [ubuntu , 18.04, 3000.2, 3] - - [centos , 8 , 3000.2, 3] - - [centos , 7 , 3000.2, 3] - - [fedora , 31 , 3000.2, 3] - - [opensuse/leap, 15.1 , 3000.2, 3] - - [amazonlinux , 2 , 3000.2, 3] - ### ` 3000.2-py2` - - [ubuntu , 18.04, 3000.2, 2] - - [ubuntu , 16.04, 3000.2, 2] - - [arch-base , latest, 3000.2, 2] + ### `3000.3-py3` + - [debian , 10 , 3000.3, 3] + - [debian , 9 , 3000.3, 3] + - [ubuntu , 18.04, 3000.3, 3] + - [centos , 8 , 3000.3, 3] + - [centos , 7 , 3000.3, 3] + - [fedora , 31 , 3000.3, 3] + - [opensuse/leap, 15.1 , 3000.3, 3] + - [amazonlinux , 2 , 3000.3, 3] + ### ` 3000.3-py2` + - [ubuntu , 18.04, 3000.3, 2] + - [ubuntu , 16.04, 3000.3, 2] + - [arch-base , latest, 3000.3, 2] ### `2019.2-py3` - [debian , 10 , 2019.2, 3] @@ -101,9 +101,9 @@ ssf_node_anchors: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - [centos , 8 , master, 3, default] - - [ubuntu , 18.04, 3000.2, 3, default] - - [opensuse/leap, 15.1 , 3000.2, 3, default] - - [amazonlinux , 2 , 3000.2, 3, default] + - [ubuntu , 18.04, 3000.3, 3, default] + - [opensuse/leap, 15.1 , 3000.3, 3, default] + - [amazonlinux , 2 , 3000.3, 3, default] - [fedora , 31 , 2019.2, 3, default] - [arch-base , latest, 2019.2, 2, default] @@ -142,7 +142,7 @@ ssf_node_anchors: platforms_osfamily_suse_new: &platforms_osfamily_suse_new # [os , os_ver, salt_ver, py_ver] - [opensuse/leap, 15.1 , master, 3] - - [opensuse/leap, 15.1 , 3000.2, 3] + - [opensuse/leap, 15.1 , 3000.3, 3] - [opensuse/leap, 15.1 , 2019.2, 3] - [opensuse/leap, 15.1 , 2018.3, 2] platforms_os_debian: &platforms_os_debian @@ -201,7 +201,7 @@ ssf_node_anchors: - [arch-base , latest, 2017.7, 2] platforms_os_arch_base_new: &platforms_os_arch_base_new # [os , os_ver, salt_ver, py_ver] - - [arch-base , latest, 3000.2, 2] + - [arch-base , latest, 3000.3, 2] - [arch-base , latest, 2019.2, 2] platforms_os_redhat_locale_specific: &platforms_os_redhat_locale_specific # [os , os_ver, salt_ver, py_ver] @@ -782,8 +782,8 @@ ssf: # - [centos , 8 , master, 3, default] - [fedora , 31 , master, 3, default] - [opensuse/leap, 15.1 , master, 3, default] - - [ubuntu , 18.04, 3000.2, 3, default] - - [amazonlinux , 2 , 3000.2, 3, default] + - [ubuntu , 18.04, 3000.3, 3, default] + - [amazonlinux , 2 , 3000.3, 3, default] # Was working but file comparison now tripping up on spaces on empty lines # - [centos , 7 , 2019.2, 3, default] - [centos , 6 , 2019.2, 2, default] @@ -1579,9 +1579,9 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - [debian , 10 , master, 3, clean] - - [ubuntu , 18.04, 3000.2, 3, default] - - [centos , 8 , 3000.2, 3, default] - - [opensuse/leap, 15.1 , 3000.2, 3, default] + - [ubuntu , 18.04, 3000.3, 3, default] + - [centos , 8 , 3000.3, 3, default] + - [opensuse/leap, 15.1 , 3000.3, 3, default] - [fedora , 31 , 2019.2, 3, default] - [ubuntu , 16.04, 2019.2, 3, default] use_libsaltcli: true @@ -1791,7 +1791,7 @@ ssf: - [centos , 8 , master, 3, archive] - [fedora , 31 , master, 3, archive] - [opensuse/leap, 15.1 , master, 3, archive] - - [centos , 7 , 3000.2, 3, default] + - [centos , 7 , 3000.3, 3, default] - [arch-base , latest, 2019.2, 2, archive] platforms_matrix_commented_includes: # [os , os_ver, salt_ver, py_ver, inspec_suite] @@ -1804,17 +1804,17 @@ ssf: - [fedora , 31 , master, 3, default] - [opensuse/leap, 15.1 , master, 3, default] - [amazonlinux , 2 , master, 3, default] - - [debian , 10 , 3000.2, 3, default] - - [debian , 9 , 3000.2, 3, default] - - [ubuntu , 18.04, 3000.2, 3, default] - - [centos , 8 , 3000.2, 3, default] - - [centos , 7 , 3000.2, 3, default] - - [fedora , 31 , 3000.2, 3, default] - - [opensuse/leap, 15.1 , 3000.2, 3, default] - - [amazonlinux , 2 , 3000.2, 3, default] - - [ubuntu , 18.04, 3000.2, 2, default] - - [ubuntu , 16.04, 3000.2, 2, default] - - [arch-base , latest, 3000.2, 2, default] + - [debian , 10 , 3000.3, 3, default] + - [debian , 9 , 3000.3, 3, default] + - [ubuntu , 18.04, 3000.3, 3, default] + - [centos , 8 , 3000.3, 3, default] + - [centos , 7 , 3000.3, 3, default] + - [fedora , 31 , 3000.3, 3, default] + - [opensuse/leap, 15.1 , 3000.3, 3, default] + - [amazonlinux , 2 , 3000.3, 3, default] + - [ubuntu , 18.04, 3000.3, 2, default] + - [ubuntu , 16.04, 3000.3, 2, default] + - [arch-base , latest, 3000.3, 2, default] - [debian , 10 , 2019.2, 3, default] - [debian , 9 , 2019.2, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] @@ -1935,7 +1935,7 @@ ssf: # - [debian , 10 , master, 3, default] - [ubuntu , 18.04, master, 3, default] - [centos , 8 , master, 3, default] - - [amazonlinux , 2 , 3000.2, 3, default] + - [amazonlinux , 2 , 3000.3, 3, default] - [debian , 9 , 2019.2, 3, default] - [ubuntu , 16.04, 2019.2, 3, default] - [centos , 7 , 2019.2, 3, default] @@ -1984,9 +1984,9 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - [centos , 8 , master, 3, default] - - [ubuntu , 18.04, 3000.2, 3, default] - - [opensuse/leap, 15.1 , 3000.2, 3, default] - - [amazonlinux , 2 , 3000.2, 3, archive] + - [ubuntu , 18.04, 3000.3, 3, default] + - [opensuse/leap, 15.1 , 3000.3, 3, default] + - [amazonlinux , 2 , 3000.3, 3, archive] - [fedora , 31 , 2019.2, 3, default] - [arch-base , latest, 2019.2, 2, default] # To deal with excessive instances when mimicking `kitchen list -b` @@ -2002,17 +2002,17 @@ ssf: - [fedora , 31 , master, 3, default] - [opensuse/leap, 15.1 , master, 3, default] - [amazonlinux , 2 , master, 3, default] - - [debian , 10 , 3000.2, 3, default] - - [debian , 9 , 3000.2, 3, default] - - [ubuntu , 18.04, 3000.2, 3, default] - - [centos , 8 , 3000.2, 3, default] - - [centos , 7 , 3000.2, 3, default] - - [fedora , 31 , 3000.2, 3, default] - - [opensuse/leap, 15.1 , 3000.2, 3, default] - - [amazonlinux , 2 , 3000.2, 3, default] - - [ubuntu , 18.04, 3000.2, 2, default] - - [ubuntu , 16.04, 3000.2, 2, default] - - [arch-base , latest, 3000.2, 2, default] + - [debian , 10 , 3000.3, 3, default] + - [debian , 9 , 3000.3, 3, default] + - [ubuntu , 18.04, 3000.3, 3, default] + - [centos , 8 , 3000.3, 3, default] + - [centos , 7 , 3000.3, 3, default] + - [fedora , 31 , 3000.3, 3, default] + - [opensuse/leap, 15.1 , 3000.3, 3, default] + - [amazonlinux , 2 , 3000.3, 3, default] + - [ubuntu , 18.04, 3000.3, 2, default] + - [ubuntu , 16.04, 3000.3, 2, default] + - [arch-base , latest, 3000.3, 2, default] - [debian , 10 , 2019.2, 3, default] - [debian , 9 , 2019.2, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] @@ -2086,11 +2086,11 @@ ssf: # https://bugs.centos.org/view.php?id=16959 # # - [centos , 8 , master, 3, default] - [fedora , 31 , master, 3, default] - - [ubuntu , 18.04, 3000.2, 3, default] - - [opensuse/leap, 15.1 , 3000.2, 3, default] + - [ubuntu , 18.04, 3000.3, 3, default] + - [opensuse/leap, 15.1 , 3000.3, 3, default] # TLS certificates error preventing the service from starting: # Could not get the realpath: No such file or directory - # # - [amazonlinux , 2 , 3000.2, 3, default] + # # - [amazonlinux , 2 , 3000.3, 3, default] - [debian , 9 , 2019.2, 3, default] - [ubuntu , 16.04, 2019.2, 3, default] # Docker/Systemd problem: @@ -2443,9 +2443,9 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] # - [centos , 8 , master, 3, default] - # - [ubuntu , 18.04, 3000.2, 3, default] - - [opensuse/leap, 15.1 , 3000.2, 3, default] - # - [amazonlinux , 2 , 3000.2, 3, default] + # - [ubuntu , 18.04, 3000.3, 3, default] + - [opensuse/leap, 15.1 , 3000.3, 3, default] + # - [amazonlinux , 2 , 3000.3, 3, default] - [fedora , 31 , 2019.2, 3, default] # - [arch-base , latest, 2019.2, 2, default] yamllint: @@ -3100,9 +3100,9 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - [centos , 8 , master, 3, default] - - [ubuntu , 18.04, 3000.2, 3, default] - - [opensuse/leap, 15.1 , 3000.2, 3, default] - - [amazonlinux , 2 , 3000.2, 3, default] + - [ubuntu , 18.04, 3000.3, 3, default] + - [opensuse/leap, 15.1 , 3000.3, 3, default] + - [amazonlinux , 2 , 3000.3, 3, default] - [fedora , 31 , 2019.2, 3, default] - [centos , 6 , 2019.2, 2, centos6] - [arch-base , latest, 2019.2, 2, default] @@ -3176,7 +3176,7 @@ ssf: - [ubuntu , 18.04, master, 3, default] - [fedora , 31 , master, 3, default] - [opensuse/leap, 15.1 , master, 3, default] - - [amazonlinux , 2 , 3000.2, 3, default] + - [amazonlinux , 2 , 3000.3, 3, default] - [debian , 9 , 2019.2, 3, default] - [centos , 7 , 2019.2, 3, default] # Tomcat appears to require an older version of JVM on Arch @@ -3358,9 +3358,9 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - [centos , 8 , master, 3, default] - - [ubuntu , 18.04, 3000.2, 3, default] - - [opensuse/leap, 15.1 , 3000.2, 3, suse] - - [amazonlinux , 2 , 3000.2, 3, default] + - [ubuntu , 18.04, 3000.3, 3, default] + - [opensuse/leap, 15.1 , 3000.3, 3, suse] + - [amazonlinux , 2 , 3000.3, 3, default] - [fedora , 31 , 2019.2, 3, default] - [arch-base , latest, 2019.2, 2, default] # # Enable this in a subsequent PR, since it's an old version, @@ -3414,9 +3414,9 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, ''] - [centos , 8 , master, 3, prod_server] - - [ubuntu , 18.04, 3000.2, 3, prod_server] - - [opensuse/leap, 15.1 , 3000.2, 3, prod_server] - - [amazonlinux , 2 , 3000.2, 3, prod_server] + - [ubuntu , 18.04, 3000.3, 3, prod_server] + - [opensuse/leap, 15.1 , 3000.3, 3, prod_server] + - [amazonlinux , 2 , 3000.3, 3, prod_server] - [fedora , 31 , 2019.2, 3, prod_server] - [arch-base , latest, 2019.2, 2, prod_server] # To deal with excessive instances when mimicking `kitchen list -b` @@ -3429,17 +3429,17 @@ ssf: - [fedora , 31 , master, 3, prod_server] - [opensuse/leap, 15.1 , master, 3, prod_server] - [amazonlinux , 2 , master, 3, prod_server] - - [debian , 10 , 3000.2, 3, prod_server] - - [debian , 9 , 3000.2, 3, prod_server] - - [ubuntu , 18.04, 3000.2, 3, prod_server] - - [centos , 8 , 3000.2, 3, prod_server] - - [centos , 7 , 3000.2, 3, prod_server] - - [fedora , 31 , 3000.2, 3, prod_server] - - [opensuse/leap, 15.1 , 3000.2, 3, prod_server] - - [amazonlinux , 2 , 3000.2, 3, prod_server] - - [ubuntu , 18.04, 3000.2, 2, prod_server] - - [ubuntu , 16.04, 3000.2, 2, prod_server] - - [arch-base , latest, 3000.2, 2, prod_server] + - [debian , 10 , 3000.3, 3, prod_server] + - [debian , 9 , 3000.3, 3, prod_server] + - [ubuntu , 18.04, 3000.3, 3, prod_server] + - [centos , 8 , 3000.3, 3, prod_server] + - [centos , 7 , 3000.3, 3, prod_server] + - [fedora , 31 , 3000.3, 3, prod_server] + - [opensuse/leap, 15.1 , 3000.3, 3, prod_server] + - [amazonlinux , 2 , 3000.3, 3, prod_server] + - [ubuntu , 18.04, 3000.3, 2, prod_server] + - [ubuntu , 16.04, 3000.3, 2, prod_server] + - [arch-base , latest, 3000.3, 2, prod_server] - [debian , 10 , 2019.2, 3, prod_server] - [debian , 9 , 2019.2, 3, prod_server] - [ubuntu , 18.04, 2019.2, 3, prod_server] @@ -3513,7 +3513,7 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - [fedora , 31 , master, 3, default] - - [ubuntu , 18.04, 3000.2, 3, default] + - [ubuntu , 18.04, 3000.3, 3, default] - [debian , 9 , 2019.2, 3, default] - [ubuntu , 16.04, 2019.2, 3, default] use_tofs: true