diff options
| author | Tim Smith <tsmith@chef.io> | 2020-05-13 17:12:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-13 17:12:33 -0700 |
| commit | 15613d8829fbd0b5106871ad6ba846bb213655c3 (patch) | |
| tree | ca6d46b20b6ea970ef020b1f6bb5d2484b3a0146 | |
| parent | 9d16843aeff960de53c06da0f7a58369e22c9d90 (diff) | |
| parent | 4bdec713b4b4bcc3a7df157545f9596b12318eee (diff) | |
| download | chef-15613d8829fbd0b5106871ad6ba846bb213655c3.tar.gz | |
Merge pull request #9864 from chef/windows_ruby27
Switch Ruby functional test on Windows to Ruby 2.7
| -rw-r--r-- | .expeditor/verify_public.pipeline.yml | 18 | ||||
| -rw-r--r-- | scripts/bk_tests/bk_win_functional.ps1 | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/.expeditor/verify_public.pipeline.yml b/.expeditor/verify_public.pipeline.yml index 7332a08cdb..e0b848005e 100644 --- a/.expeditor/verify_public.pipeline.yml +++ b/.expeditor/verify_public.pipeline.yml @@ -192,6 +192,15 @@ steps: docker: image: rubydistros/fedora-latest:2.7 +- label: "Functional Windows :ruby: 2.7" + commands: + - scripts/bk_tests/bk_win_functional.ps1 + expeditor: + executor: + windows: + privileged: true + shell: ["powershell", "-Command"] + ######################################################################### # Tests Ruby 2.6 ######################################################################### @@ -208,15 +217,6 @@ steps: - CHEF_LICENSE=accept-no-persist shell: ["powershell", "-Command"] -- label: "Functional Windows :ruby: 2.6" - commands: - - scripts/bk_tests/bk_win_functional.ps1 - expeditor: - executor: - windows: - privileged: true - shell: ["powershell", "-Command"] - - label: "Chocolatey Windows :ruby: 2.6" commands: - /workdir/scripts/bk_tests/bk_run_choco.ps1 diff --git a/scripts/bk_tests/bk_win_functional.ps1 b/scripts/bk_tests/bk_win_functional.ps1 index 9447c1853f..b16dd3c1f7 100644 --- a/scripts/bk_tests/bk_win_functional.ps1 +++ b/scripts/bk_tests/bk_win_functional.ps1 @@ -1,8 +1,8 @@ # The filename of the Ruby installer -$RubyFilename = "rubyinstaller-devkit-2.6.6-1-x64.exe" +$RubyFilename = "rubyinstaller-devkit-2.7.1-1-x64.exe" # The sha256 of the Ruby installer (capitalized?) -$RubySHA256 = "6381FA0C683D4B9F8CEEDAA6B8B1191A0C4029588F11F8C77979F6E2CC00DD98" +$RubySHA256 = "B22C5C1C819A53A1676CCA3410E3FF1BB39A9510C0CFD1E7BA19A728AE4FE86F" # Where on disk to download Ruby to $RubyPath = "$env:temp\$RubyFilename" |