Skip to content

Commit

Permalink
Merge pull request #167 from myii/feat/remove-master-py2-arch-base
Browse files Browse the repository at this point in the history 
feat(arch-base): remove `master-py2-arch-base-latest`
  • Loading branch information
@myii
myii authored May 2, 2020
2 parents 3afeec9 + 86f4fde commit 9d31c41
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 13 deletions.
5 changes: 2 additions & 3 deletions ssf/defaults.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,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: "ci(kitchen+travis): adjust matrix to add '`'3000.2'`' & remove '`'2018.3'`'"
body: '* Semi-automated using https://github.com/myii/ssf-formula/pull/166'
title: "ci(kitchen+travis): remove '`'master-py2-arch-base-latest'`' [skip ci]"
body: '* Automated using https://github.com/myii/ssf-formula/pull/167'
# yamllint enable rule:line-length rule:quoted-strings
github:
owner: 'saltstack-formulas'
Expand Down Expand Up @@ -96,7 +96,6 @@ ssf_node_anchors:
- [opensuse/leap, 15.1 , master, 3]
### ` master-py2`
- [amazonlinux , 2 , master, 3]
- [arch-base , latest, master, 2]

### `2019.2-py3`
- [debian , 10 , 2019.2, 3]
Expand Down
10 changes: 0 additions & 10 deletions ssf/formulas.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@ ssf_node_anchors:
- [fedora , 31 , master, 3]
- [opensuse/leap, 15.1 , master, 3]
- [amazonlinux , 2 , master, 3]
### ` master-py2`
- [arch-base , latest, master, 2]

### `3000.1-py3`
- [debian , 10 , 3000.1, 3]
Expand Down Expand Up @@ -203,7 +201,6 @@ ssf_node_anchors:
- [amazonlinux , 1 , 2017.7, 2]
platforms_os_arch_base: &platforms_os_arch_base
# [os , os_ver, salt_ver, py_ver]
- [arch-base , latest, master, 2]
- [arch-base , latest, 2019.2, 2]
- [arch-base , latest, 2018.3, 2]
- [arch-base , latest, 2017.7, 2]
Expand All @@ -222,7 +219,6 @@ ssf_node_anchors:
platforms_os_centos_and_arch: &platforms_os_centos_and_arch
# [os , os_ver, salt_ver, py_ver]
- [centos , 8 , master, 3]
- [arch-base , latest, master, 2]
- [centos , 8 , 2019.2, 3]
- [centos , 7 , 2019.2, 2]
- [arch-base , latest, 2019.2, 2]
Expand Down Expand Up @@ -601,7 +597,6 @@ ssf:
# - [fedora , 31 , master, 3, default]
# - [opensuse/leap, 15.1 , master, 3, default]
# # - [amazonlinux , 2 , master, 3, default]
# # - [arch-base , latest, master, 2, default]
- [debian , 10 , 2019.2, 3, default] # CHECK
- [debian , 9 , 2019.2, 3, default]
# - [ubuntu , 18.04, 2019.2, 3, default]
Expand Down Expand Up @@ -1270,7 +1265,6 @@ ssf:
- [fedora , 31 , master, 3, loop5-loop6]
- [opensuse/leap, 15.1 , master, 3, loop5-loop6]
- [amazonlinux , 2 , master, 3, loop5-loop6]
- [arch-base , latest, master, 2, loop5-loop6]
- [debian , 10 , 2019.2, 3, loop5-loop6]
- [debian , 9 , 2019.2, 3, loop5-loop6]
- [ubuntu , 18.04, 2019.2, 3, loop5-loop6]
Expand Down Expand Up @@ -1497,7 +1491,6 @@ ssf:
- [fedora , 31 , master, 3, default]
- [opensuse/leap, 15.1 , master, 3, default]
- [amazonlinux , 2 , master, 3, default]
- [arch-base , latest, master, 2, default]
- [debian , 10 , 3000.1, 3, default]
- [ubuntu , 18.04, 3000.1, 3, default]
- [centos , 8 , 3000.1, 3, default]
Expand Down Expand Up @@ -2425,7 +2418,6 @@ ssf:
- [fedora , 31 , master, 3]
- [opensuse/leap, 15.1 , master, 3]
- [amazonlinux , 2 , master, 3]
- [arch-base , latest, master, 2]
- [debian , 9 , 2019.2, 3]
- [ubuntu , 18.04, 2019.2, 3]
- [centos , 8 , 2019.2, 3]
Expand Down Expand Up @@ -2706,7 +2698,6 @@ ssf:
- [fedora , 31 , master, 3, default]
- [opensuse/leap, 15.1 , master, 3, default]
- [amazonlinux , 2 , master, 3, default]
- [arch-base , latest, master, 2, default]
- [debian , 10 , 2019.2, 3, default]
- [debian , 9 , 2019.2, 3, default]
- [ubuntu , 18.04, 2019.2, 3, default]
Expand Down Expand Up @@ -2840,7 +2831,6 @@ ssf:
- [fedora , 31 , master, 3, prod_server]
- [opensuse/leap, 15.1 , master, 3, prod_server]
- [amazonlinux , 2 , master, 3, prod_server]
- [arch-base , latest, master, 2, prod_server]
- [debian , 10 , 3000.1, 3, prod_server]
- [centos , 8 , 3000.1, 3, prod_server]
- [fedora , 31 , 3000.1, 3, prod_server]
Expand Down

0 comments on commit 9d31c41

Please sign in to comment.