Merge 319cc516ff1d3c640fca89ebc4a6701a201891f1 into bf52207a9bcdfcba7abe27013c082594a8ae139d

.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 }}'

.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:

kitchen.macos.yml

@@ -7,19 +7,19 @@ driver:
 provisioner:
   sudo: true
   salt_install: bootstrap
-  salt_bootstrap_options: -P stable latest
+  salt_bootstrap_options: -P onedir 3006.1
   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

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

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 onedir
   # 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