diff options
| author | Jaymala Sinha <jsinha@chef.io> | 2019-09-16 14:54:30 -0400 |
|---|---|---|
| committer | Jaymala Sinha <jsinha@chef.io> | 2019-09-25 10:11:50 -0400 |
| commit | 6d245219d8c6b2e4d48a972c6019ead6e6b88030 (patch) | |
| tree | 733ede7284fd2996b855cee6ff37ce96049eb080 | |
| parent | 0b773e76d0681f050bd493e3603268f8f6ef3a38 (diff) | |
| download | chef-6d245219d8c6b2e4d48a972c6019ead6e6b88030.tar.gz | |
Enable Windows Buildkite verification on default image
Signed-off-by: Jaymala Sinha <jsinha@chef.io>
| -rw-r--r-- | .expeditor/verify.pipeline.yml | 2 | ||||
| -rw-r--r-- | scripts/bk_tests/bk_win_functional.ps1 | 4 | ||||
| -rw-r--r-- | scripts/bk_tests/bk_win_integration.ps1 | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index c45f2e9933..2a008cd6f3 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -199,7 +199,6 @@ steps: executor: docker: host_os: windows - os_version: 2016 environment: - FORCE_FFI_YAJL=ext - CHEF_LICENSE=accept-no-persist @@ -212,7 +211,6 @@ steps: executor: docker: host_os: windows - os_version: 2016 environment: - FORCE_FFI_YAJL=ext - CHEF_LICENSE=accept-no-persist diff --git a/scripts/bk_tests/bk_win_functional.ps1 b/scripts/bk_tests/bk_win_functional.ps1 index 06695ccd97..c8d5dd40e4 100644 --- a/scripts/bk_tests/bk_win_functional.ps1 +++ b/scripts/bk_tests/bk_win_functional.ps1 @@ -1,6 +1,10 @@ echo "--- system details" $Properties = 'Caption', 'CSName', 'Version', 'BuildType', 'OSArchitecture' Get-CimInstance Win32_OperatingSystem | Select-Object $Properties | Format-Table -AutoSize + +winrm quickconfig -q +# Set-Item -Path Env:Path -Value ($Env:Path + ";C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin") +$Env:path="C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\ruby26\bin;C:\ci-studio-common\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\ProgramData\chocolatey\bin;C:\Program Files\Git\cmd;C:\Users\ContainerAdministrator\AppData\Local\Microsoft\WindowsApps;C:\Go\bin;C:\Users\ContainerAdministrator\go\bin" ruby -v bundle --version diff --git a/scripts/bk_tests/bk_win_integration.ps1 b/scripts/bk_tests/bk_win_integration.ps1 index c6cdd5e2b1..70b92b9f06 100644 --- a/scripts/bk_tests/bk_win_integration.ps1 +++ b/scripts/bk_tests/bk_win_integration.ps1 @@ -1,6 +1,10 @@ echo "--- system details" $Properties = 'Caption', 'CSName', 'Version', 'BuildType', 'OSArchitecture' Get-CimInstance Win32_OperatingSystem | Select-Object $Properties | Format-Table -AutoSize + +# Set-Item -Path Env:Path -Value ($Env:Path + ";C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin") +$Env:path="C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\ruby26\bin;C:\ci-studio-common\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\ProgramData\chocolatey\bin;C:\Program Files\Git\cmd;C:\Users\ContainerAdministrator\AppData\Local\Microsoft\WindowsApps;C:\Go\bin;C:\Users\ContainerAdministrator\go\bin" + ruby -v bundle --version |