From fe0c97555596d85650852df3804f938a28dc7433 Mon Sep 17 00:00:00 2001 From: Twangboy Date: Thu, 20 Apr 2023 16:02:53 -0600 Subject: [PATCH] Add 3006 to the tests, fix salt_call_command --- .github/workflows/ci.yml | 4 ++-- kitchen.windows.yml | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0e01c95..3e0f693 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -219,7 +219,7 @@ jobs: display-name: Windows 2019 timeout: 20 runs-on: windows-2019 - instances: '["stable-3003", "stable-3004", "stable-3005", "latest"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "stable-3006", "latest"]' windows-2022: @@ -234,7 +234,7 @@ jobs: display-name: Windows 2022 timeout: 20 runs-on: windows-2022 - instances: '["stable-3003", "stable-3004", "stable-3005", "latest"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "stable-3006", "latest"]' diff --git a/kitchen.windows.yml b/kitchen.windows.yml index f68f4b1..ccd3f05 100644 --- a/kitchen.windows.yml +++ b/kitchen.windows.yml @@ -20,16 +20,23 @@ suites: - name: stable-3003 provisioner: salt_version: 3003.4-1 + salt_call_command: c:\salt\salt-call.bat - name: stable-3004 provisioner: salt_version: 3004.1-1 + salt_call_command: c:\Program Files\Salt Project\Salt\salt-call.bat - name: stable-3005 provisioner: salt_version: 3005.1-1 + salt_call_command: c:\Program Files\Salt Project\Salt\salt-call.bat + - name: stable-3006 + provisioner: + salt_version: 3006.0 + salt_call_command: c:\Program Files\Salt Project\Salt\salt-call.exe - name: latest provisioner: salt_version: latest - salt_call_command: c:\Program Files\Salt Project\Salt\salt-call.bat + salt_call_command: c:\Program Files\Salt Project\Salt\salt-call.exe verifier: command: pytest --cache-clear -v -s -ra --log-cli-level=debug -k "not test_ping" tests/integration/