diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2020-01-28 15:58:50 -0800 |
---|---|---|
committer | Lamont Granquist <lamont@scriptkiddie.org> | 2020-01-28 15:58:50 -0800 |
commit | 43f6d73e3a2728ba93dfb051172f19962aa23c43 (patch) | |
tree | f2e143b8504e9b729959e3cdfc1312959939c4c2 /scripts | |
parent | 7ed728730efae7a7f0cc532316fa11b79fe2f873 (diff) | |
download | chef-43f6d73e3a2728ba93dfb051172f19962aa23c43.tar.gz |
Add ruby 2.7 testing
bumps to bundler 2.1.2 and rubygems 3.1.2 because ruby 2.7 comes with those
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/bk_tests/bk_run_choco.ps1 | 18 | ||||
-rw-r--r-- | scripts/bk_tests/bk_win_functional.ps1 | 18 | ||||
-rw-r--r-- | scripts/bk_tests/bk_win_integration.ps1 | 17 | ||||
-rw-r--r-- | scripts/bk_tests/bk_win_unit.ps1 | 18 |
4 files changed, 67 insertions, 4 deletions
diff --git a/scripts/bk_tests/bk_run_choco.ps1 b/scripts/bk_tests/bk_run_choco.ps1 index 1d4b87a73a..5360cc4914 100644 --- a/scripts/bk_tests/bk_run_choco.ps1 +++ b/scripts/bk_tests/bk_run_choco.ps1 @@ -3,7 +3,23 @@ $Properties = 'Caption', 'CSName', 'Version', 'BuildType', 'OSArchitecture' Get-CimInstance Win32_OperatingSystem | Select-Object $Properties | Format-Table -AutoSize choco --version + +echo "--- update bundler and rubygems" + ruby -v + +$env:RUBYGEMS_VERSION=$(findstr rubygems omnibus_overrides.rb | %{ $_.split(" ")[3] }) +$env:BUNDLER_VERSION=$(findstr bundler omnibus_overrides.rb | %{ $_.split(" ")[3] }) + +$env:RUBYGEMS_VERSION=($env:RUBYGEMS_VERSION -replace '"', "") +$env:BUNDLER_VERSION=($env:BUNDLER_VERSION -replace '"', "") + +echo $env:RUBYGEMS_VERSION +echo $env:BUNDLER_VERSION + +gem update --system $env:RUBYGEMS_VERSION +gem --version +gem install bundler -v $env:BUNDLER_VERSION --force --no-document --quiet bundle --version echo "--- bundle install" @@ -12,4 +28,4 @@ bundle install --jobs=3 --retry=3 --without omnibus_package docgen chefstyle echo "+++ bundle exec rspec chocolatey_package_spec" bundle exec rspec spec/functional/resource/chocolatey_package_spec.rb -exit $LASTEXITCODE
\ No newline at end of file +exit $LASTEXITCODE diff --git a/scripts/bk_tests/bk_win_functional.ps1 b/scripts/bk_tests/bk_win_functional.ps1 index 3cca7a7fff..e3a0328ef3 100644 --- a/scripts/bk_tests/bk_win_functional.ps1 +++ b/scripts/bk_tests/bk_win_functional.ps1 @@ -27,7 +27,23 @@ echo "Closing out the layer (this can take awhile)" $Env:Path+=";C:\ruby26\bin" winrm quickconfig -q + +echo "--- update bundler and rubygems" + ruby -v + +$env:RUBYGEMS_VERSION=$(findstr rubygems omnibus_overrides.rb | %{ $_.split(" ")[3] }) +$env:BUNDLER_VERSION=$(findstr bundler omnibus_overrides.rb | %{ $_.split(" ")[3] }) + +$env:RUBYGEMS_VERSION=($env:RUBYGEMS_VERSION -replace '"', "") +$env:BUNDLER_VERSION=($env:BUNDLER_VERSION -replace '"', "") + +echo $env:RUBYGEMS_VERSION +echo $env:BUNDLER_VERSION + +gem update --system $env:RUBYGEMS_VERSION +gem --version +gem install bundler -v $env:BUNDLER_VERSION --force --no-document --quiet bundle --version echo "--- bundle install" @@ -36,4 +52,4 @@ bundle install --jobs=3 --retry=3 --without omnibus_package docgen chefstyle echo "+++ bundle exec rake spec:functional" bundle exec rake spec:functional -exit $LASTEXITCODE
\ No newline at end of file +exit $LASTEXITCODE diff --git a/scripts/bk_tests/bk_win_integration.ps1 b/scripts/bk_tests/bk_win_integration.ps1 index 546a9fbb91..36a6ea2ea9 100644 --- a/scripts/bk_tests/bk_win_integration.ps1 +++ b/scripts/bk_tests/bk_win_integration.ps1 @@ -7,7 +7,22 @@ $Env:Path="C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\ruby winrm quickconfig -q +echo "--- update bundler and rubygems" + ruby -v + +$env:RUBYGEMS_VERSION=$(findstr rubygems omnibus_overrides.rb | %{ $_.split(" ")[3] }) +$env:BUNDLER_VERSION=$(findstr bundler omnibus_overrides.rb | %{ $_.split(" ")[3] }) + +$env:RUBYGEMS_VERSION=($env:RUBYGEMS_VERSION -replace '"', "") +$env:BUNDLER_VERSION=($env:BUNDLER_VERSION -replace '"', "") + +echo $env:RUBYGEMS_VERSION +echo $env:BUNDLER_VERSION + +gem update --system $env:RUBYGEMS_VERSION +gem --version +gem install bundler -v $env:BUNDLER_VERSION --force --no-document --quiet bundle --version echo "--- bundle install" @@ -16,4 +31,4 @@ bundle install --jobs=3 --retry=3 --without omnibus_package docgen chefstyle echo "+++ bundle exec rake spec:integration" bundle exec rake spec:integration -exit $LASTEXITCODE
\ No newline at end of file +exit $LASTEXITCODE diff --git a/scripts/bk_tests/bk_win_unit.ps1 b/scripts/bk_tests/bk_win_unit.ps1 index 48ad3fe283..4e07179a35 100644 --- a/scripts/bk_tests/bk_win_unit.ps1 +++ b/scripts/bk_tests/bk_win_unit.ps1 @@ -1,7 +1,23 @@ echo "--- system details" $Properties = 'Caption', 'CSName', 'Version', 'BuildType', 'OSArchitecture' Get-CimInstance Win32_OperatingSystem | Select-Object $Properties | Format-Table -AutoSize + +echo "--- update bundler and rubygems" + ruby -v + +$env:RUBYGEMS_VERSION=$(findstr rubygems omnibus_overrides.rb | %{ $_.split(" ")[3] }) +$env:BUNDLER_VERSION=$(findstr bundler omnibus_overrides.rb | %{ $_.split(" ")[3] }) + +$env:RUBYGEMS_VERSION=($env:RUBYGEMS_VERSION -replace '"', "") +$env:BUNDLER_VERSION=($env:BUNDLER_VERSION -replace '"', "") + +echo $env:RUBYGEMS_VERSION +echo $env:BUNDLER_VERSION + +gem update --system $env:RUBYGEMS_VERSION +gem --version +gem install bundler -v $env:BUNDLER_VERSION --force --no-document --quiet bundle --version echo "--- bundle install" @@ -11,4 +27,4 @@ echo "+++ bundle exec rake" bundle exec rake spec:unit bundle exec rake component_specs -exit $LASTEXITCODE
\ No newline at end of file +exit $LASTEXITCODE |