From 0d7e4ff9ee394ac24651500a648dc670f87dd7d6 Mon Sep 17 00:00:00 2001 From: Sean Molenaar Date: Wed, 14 Jun 2023 13:04:25 +0200 Subject: [PATCH 1/5] fix: use supported macOS and Salt versions in CI --- .github/workflows/kitchen.macos.yml | 46 +++++++++++++-------------- .github/workflows/kitchen.vagrant.yml | 2 +- kitchen.macos.yml | 12 +++---- kitchen.vagrant.yml | 4 +-- kitchen.windows.yml | 6 ++-- 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.github/workflows/kitchen.macos.yml b/.github/workflows/kitchen.macos.yml index 038ceb6..3860816 100644 --- a/.github/workflows/kitchen.macos.yml +++ b/.github/workflows/kitchen.macos.yml @@ -8,6 +8,29 @@ env: KITCHEN_LOCAL_YAML: 'kitchen.macos.yml' jobs: + test-13: + runs-on: 'macos-12' + strategy: + fail-fast: false + matrix: + instance: + - default-macos-13-latest-py3 + steps: + - name: 'Check out code' + uses: 'actions/checkout@v2' + - name: 'Set up Bundler cache' + uses: 'actions/cache@v1' + with: + path: 'vendor/bundle' + key: "${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}" + restore-keys: "${{ runner.os }}-gems-" + - name: 'Run Bundler' + run: | + ruby --version + bundle config path vendor/bundle + bundle install --jobs 4 --retry 3 + - name: 'Run Test Kitchen' + run: 'bundle exec kitchen verify ${{ matrix.instance }}' test-12: runs-on: 'macos-12' strategy: @@ -54,26 +77,3 @@ jobs: bundle install --jobs 4 --retry 3 - name: 'Run Test Kitchen' run: 'bundle exec kitchen verify ${{ matrix.instance }}' - test-1015: - runs-on: 'macos-10.15' - strategy: - fail-fast: false - matrix: - instance: - - default-macos-1015-latest-py3 - steps: - - name: 'Check out code' - uses: 'actions/checkout@v2' - - name: 'Set up Bundler cache' - uses: 'actions/cache@v1' - with: - path: 'vendor/bundle' - key: "${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}" - restore-keys: "${{ runner.os }}-gems-" - - name: 'Run Bundler' - run: | - ruby --version - bundle config path vendor/bundle - bundle install --jobs 4 --retry 3 - - name: 'Run Test Kitchen' - run: 'bundle exec kitchen verify ${{ matrix.instance }}' diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml index b99aad0..635626f 100644 --- a/.github/workflows/kitchen.vagrant.yml +++ b/.github/workflows/kitchen.vagrant.yml @@ -9,7 +9,7 @@ env: jobs: test: - runs-on: 'macos-10.15' + runs-on: 'macos-12' strategy: fail-fast: false matrix: diff --git a/kitchen.macos.yml b/kitchen.macos.yml index 2528195..488edaf 100644 --- a/kitchen.macos.yml +++ b/kitchen.macos.yml @@ -11,15 +11,15 @@ provisioner: salt_call_command: /opt/salt/bin/salt-call platforms: + - name: macos-13-latest-py3 + verifier: + inputs: + saltmajorversion: 3006 - name: macos-12-latest-py3 verifier: inputs: - saltmajorversion: 3004 + saltmajorversion: 3006 - name: macos-11-latest-py3 verifier: inputs: - saltmajorversion: 3004 - - name: macos-1015-latest-py3 - verifier: - inputs: - saltmajorversion: 3004 + saltmajorversion: 3006 diff --git a/kitchen.vagrant.yml b/kitchen.vagrant.yml index c76adae..d45b3ef 100644 --- a/kitchen.vagrant.yml +++ b/kitchen.vagrant.yml @@ -74,7 +74,7 @@ platforms: # yamllint enable rule:line-length verifier: inputs: - saltmajorversion: 3004 + saltmajorversion: 3006 - name: windows-81-latest-py3 driver: box: techneg/win81x64-pro-salt @@ -98,4 +98,4 @@ platforms: # yamllint enable rule:line-length verifier: inputs: - saltmajorversion: 3004 + saltmajorversion: 3006 diff --git a/kitchen.windows.yml b/kitchen.windows.yml index 401a503..a469054 100644 --- a/kitchen.windows.yml +++ b/kitchen.windows.yml @@ -11,7 +11,7 @@ driver: provisioner: salt_install: bootstrap - salt_bootstrap_options: -pythonVersion 3 -version 3004.1-1 + salt_bootstrap_options: -version latest # yamllint disable rule:line-length init_environment: | salt-call --local state.single file.managed ` @@ -24,8 +24,8 @@ platforms: - name: windows-2022-latest-py3 verifier: inputs: - saltmajorversion: 3004 + saltmajorversion: 3006 - name: windows-2019-latest-py3 verifier: inputs: - saltmajorversion: 3004 + saltmajorversion: 3006 From 0145a1c47043eac3b095b7f32ce127202a8dfdf5 Mon Sep 17 00:00:00 2001 From: Sean Molenaar Date: Thu, 15 Jun 2023 09:49:14 +0200 Subject: [PATCH 2/5] fix: use stable only --- kitchen.macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kitchen.macos.yml b/kitchen.macos.yml index 488edaf..6de9196 100644 --- a/kitchen.macos.yml +++ b/kitchen.macos.yml @@ -7,7 +7,7 @@ driver: provisioner: sudo: true salt_install: bootstrap - salt_bootstrap_options: -P stable latest + salt_bootstrap_options: -P stable salt_call_command: /opt/salt/bin/salt-call platforms: From 502e3ae309941273658613ca298986f257cf5a9f Mon Sep 17 00:00:00 2001 From: Sean Molenaar Date: Thu, 15 Jun 2023 10:59:20 +0200 Subject: [PATCH 3/5] fix: use 3006.1 specifically for macOS pkg --- kitchen.macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kitchen.macos.yml b/kitchen.macos.yml index 6de9196..15b9fb9 100644 --- a/kitchen.macos.yml +++ b/kitchen.macos.yml @@ -7,7 +7,7 @@ driver: provisioner: sudo: true salt_install: bootstrap - salt_bootstrap_options: -P stable + salt_bootstrap_options: -P stable 3006.1 salt_call_command: /opt/salt/bin/salt-call platforms: From a41e888eda7d39798941f6c431f6f458bef904b4 Mon Sep 17 00:00:00 2001 From: Sean Molenaar Date: Thu, 15 Jun 2023 13:23:44 +0200 Subject: [PATCH 4/5] Update kitchen.windows.yml --- kitchen.windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kitchen.windows.yml b/kitchen.windows.yml index a469054..3024743 100644 --- a/kitchen.windows.yml +++ b/kitchen.windows.yml @@ -11,7 +11,7 @@ driver: provisioner: salt_install: bootstrap - salt_bootstrap_options: -version latest + salt_bootstrap_options: -version onedir # yamllint disable rule:line-length init_environment: | salt-call --local state.single file.managed ` From 319cc516ff1d3c640fca89ebc4a6701a201891f1 Mon Sep 17 00:00:00 2001 From: Sean Molenaar Date: Thu, 15 Jun 2023 13:23:51 +0200 Subject: [PATCH 5/5] Update kitchen.macos.yml --- kitchen.macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kitchen.macos.yml b/kitchen.macos.yml index 15b9fb9..88a3b04 100644 --- a/kitchen.macos.yml +++ b/kitchen.macos.yml @@ -7,7 +7,7 @@ driver: provisioner: sudo: true salt_install: bootstrap - salt_bootstrap_options: -P stable 3006.1 + salt_bootstrap_options: -P onedir 3006.1 salt_call_command: /opt/salt/bin/salt-call platforms: