ci(workflows): update kitchen.macos.yml

.github/workflows/kitchen.macos.yml

@@ -8,64 +8,18 @@ env:
   KITCHEN_LOCAL_YAML: 'kitchen.macos.yml'
 
 jobs:
-  test-12:
-    runs-on: 'macos-12'
+  test-13:
+    runs-on: 'macos-13'
     strategy:
       fail-fast: false
       matrix:
         instance:
-          - default-macos-12-latest-py3
+          - default-macos-13-latest
     steps:
       - name: 'Check out code'
-        uses: 'actions/checkout@v2'
+        uses: 'actions/checkout@v4'
       - 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-11:
-    runs-on: 'macos-11'
-    strategy:
-      fail-fast: false
-      matrix:
-        instance:
-          - default-macos-11-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-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'
+        uses: 'actions/cache@v4'
         with:
           path: 'vendor/bundle'
           key: "${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}"

kitchen.macos.yml

@@ -8,18 +8,9 @@ provisioner:
   sudo: true
   salt_install: bootstrap
   salt_bootstrap_options: -P stable latest
-  salt_call_command: /opt/salt/bin/salt-call
+  salt_bootstrap_url: "https://github.com/saltstack/salt-bootstrap\
+                       /releases/latest/download/bootstrap-salt.sh"
+  salt_call_command: /opt/salt/salt-call
 
 platforms:
-  - name: macos-12-latest-py3
-    verifier:
-      inputs:
-        saltmajorversion: 3004
-  - name: macos-11-latest-py3
-    verifier:
-      inputs:
-        saltmajorversion: 3004
-  - name: macos-1015-latest-py3
-    verifier:
-      inputs:
-        saltmajorversion: 3004
+  - name: macos-13-latest

salt/master.sls

@@ -13,7 +13,7 @@ include:
 salt-master-macos:
   file.managed:
     - name: /Library/LaunchDaemons/com.saltstack.salt.master.plist
-    - source: https://raw.githubusercontent.com/saltstack/salt/master/pkg/osx/scripts/com.saltstack.salt.master.plist
+    - source: https://raw.githubusercontent.com/saltstack/salt/master/pkg/macos/scripts/com.saltstack.salt.master.plist
     - source_hash: {{ salt_settings.salt_master_macos_plist_hash }}
     - retry: {{ salt_settings.retry_options | json }}
     - require_in:

salt/minion.sls

@@ -42,7 +42,7 @@ salt-minion-macos:
   file.managed:
     - onlyif: {{ grains.os == 'MacOS' }}
     - name: /Library/LaunchDaemons/com.saltstack.salt.minion.plist
-    - source: https://raw.githubusercontent.com/saltstack/salt/master/pkg/osx/scripts/com.saltstack.salt.master.plist
+    - source: https://raw.githubusercontent.com/saltstack/salt/master/pkg/macos/scripts/com.saltstack.salt.master.plist
     - source_hash: {{ salt_settings.salt_minion_macos_plist_hash }}
     - retry: {{ salt_settings.retry_options | json }}
     - require_in:

salt/osmap.yaml

@@ -59,9 +59,9 @@ MacOS:
   minion_service: com.saltstack.salt.minion
   master_service: com.saltstack.salt.master
   salt_master_macos_plist_hash:
-    8435331b2d48ca8f0759f216e5b15ec9171a4216b1441328c732c6906728b7c9
+    97666226c14ec2fd755edb5d909688540a36408dfe9fb34a1c15676020376ace
   salt_minion_macos_plist_hash:
-    26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20
+    17d9556b5742a785eaddaec117132be99af138cab7157dbacbda2058538b6e69
 
 FreeBSD:
   salt_master: py39-salt