Skip to content

Commit

Permalink
ci(proxy): replace deprecated Windows 2016 with 2022 [skip ci]
Browse files Browse the repository at this point in the history
* Semi-automated using myii/ssf-formula#393
  • Loading branch information
myii committed Dec 22, 2021
1 parent a8b6534 commit 769e1d6
Show file tree
Hide file tree
Showing 5 changed files with 95 additions and 8 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/kitchen.windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ env:
KITCHEN_LOCAL_YAML: 'kitchen.windows.yml'

jobs:
test-2019:
runs-on: 'windows-2019'
test-2022:
runs-on: 'windows-2022'
strategy:
fail-fast: false
matrix:
instance:
- windows-windows-2019-latest-py3
- windows-windows-2022-latest-py3
steps:
- name: 'Check out code'
uses: 'actions/checkout@v2'
Expand Down Expand Up @@ -53,13 +53,13 @@ jobs:
bundle install --jobs 4 --retry 3
- name: 'Run Test Kitchen'
run: 'bundle exec kitchen verify ${{ matrix.instance }}'
test-2016:
runs-on: 'windows-2016'
test-2019:
runs-on: 'windows-2019'
strategy:
fail-fast: false
matrix:
instance:
- windows-windows-2016-latest-py3
- windows-windows-2019-latest-py3
steps:
- name: 'Check out code'
uses: 'actions/checkout@v2'
Expand Down
2 changes: 1 addition & 1 deletion kitchen.windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ provisioner:
salt_bootstrap_options: -pythonVersion 3 -version 3003.3

platforms:
- name: windows-2022-latest-py3
- name: windows-2019-latest-py3
- name: windows-2016-latest-py3
2 changes: 1 addition & 1 deletion kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -834,8 +834,8 @@ suites:
includes:
- windows-10-latest-py3
- windows-81-latest-py3
- windows-2022-latest-py3
- windows-2019-latest-py3
- windows-2016-latest-py3
provisioner:
state_top:
base:
Expand Down
2 changes: 2 additions & 0 deletions test/integration/share/libraries/system.rb
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ def build_platform_release
# rubocop:enable Style/NumericLiterals,Layout/LineLength
when 'windows_8.1_pro'
'8.1'
when 'windows_server_2022_datacenter'
'2022-server'
when 'windows_server_2019_datacenter'
'2019-server'
when 'windows_server_2016_datacenter'
Expand Down
85 changes: 85 additions & 0 deletions test/integration/windows/files/_mapdata/windows-2022-server.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
# yamllint disable rule:indentation rule:line-length
# Windows-2022Server
---
values:
archives:
pkgs:
required:
- curl
- bzip2
- gzip
required:
archives: {}
types:
- tar
- zip
- rar
unwanted: []
wanted: {}
chocolatey:
required:
pkgs: []
states: []
unwanted:
- GoogleChrome
- hg
wanted:
Firefox:
package_args: "/l:en-GB"
jq:
force: true
version: '1.5'
notepadplusplus:
version: 7.8.8
gems:
required:
pkgs: []
states: []
unwanted: []
wanted: []
golang:
clean: []
goget: []
kernel: windows
npms:
required:
pkgs: []
states: []
unwanted: []
wanted: []
pips:
config: []
required:
pkgs: []
states: []
unwanted: []
wanted: []
pkgs:
held: {}
required:
pkgs: []
states: []
unwanted: []
wanted: []
remote_pkgs: {}
retry_options:
attempts: 3
interval: 60
splay: 10
until: true
rootuser: root
snaps:
classic: []
collides: []
packages:
- snapd
- fuse
required:
pkgs: []
states: []
service:
- snapd
symlink: false
unwanted: []
wanted: []
tmpdir: "/tmp/saltstack-packages-formula-archives"

0 comments on commit 769e1d6

Please sign in to comment.