summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2020-12-28 17:56:02 -0800
committerTim Smith <tsmith84@gmail.com>2020-12-30 12:16:50 -0800
commitbaa790620a51b344da8dcb3623807f15ba595c84 (patch)
tree5fa730af4b68c2406214117e8c805474114273a3
parent58e2c15b7dbf983322250fd42210895f1978a772 (diff)
downloadchef-baa790620a51b344da8dcb3623807f15ba595c84.tar.gz
Fix failures due to order
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--.expeditor/scripts/bk_win_functional.ps14
-rw-r--r--.expeditor/verify.pipeline.yml8
2 files changed, 6 insertions, 6 deletions
diff --git a/.expeditor/scripts/bk_win_functional.ps1 b/.expeditor/scripts/bk_win_functional.ps1
index 9ff32ffce5..7a427dc428 100644
--- a/.expeditor/scripts/bk_win_functional.ps1
+++ b/.expeditor/scripts/bk_win_functional.ps1
@@ -8,8 +8,6 @@ Remove-Item -Path C:\ProgramData\chocolatey\bin\choco.exe -ErrorAction SilentlyC
$ErrorActionPreference = 'Stop'
Write-Output "--- Enable Ruby 2.7"
-ruby -v
-if (-not $?) { throw "Can't run Ruby. Is it installed?" }
Write-Output "Add Uru to Environment PATH"
$env:PATH = "C:\Program Files (x86)\Uru;" + $env:PATH
@@ -19,6 +17,8 @@ Write-Output "Register Installed Ruby Version 2.7 With Uru"
Start-Process "C:\Program Files (x86)\Uru\uru_rt.exe" -ArgumentList 'admin add C:\ruby27\bin' -Wait
uru 271
if (-not $?) { throw "Can't Activate Ruby. Did Uru Registration Succeed?" }
+ruby -v
+if (-not $?) { throw "Can't run Ruby. Is it installed?" }
Write-Output "--- configure winrm"
winrm quickconfig -q
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 582a8491fd..0d8dec6a89 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -244,8 +244,8 @@ steps:
- label: "Chefstyle :ruby: 2.6"
commands:
- - /workdir/.expeditor/scripts/bk_container_prep.sh
- gem install bundler -v 2.1.4 # match Ruby 2.7 bundler
+ - /workdir/.expeditor/scripts/bk_container_prep.sh
- bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
- bundle exec rake style
expeditor:
@@ -255,8 +255,8 @@ steps:
- label: "Integration :ruby: 2.6"
commands:
- - /workdir/.expeditor/scripts/bk_container_prep.sh
- gem install bundler -v 2.1.4 # match Ruby 2.7 bundler
+ - /workdir/.expeditor/scripts/bk_container_prep.sh
- bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package
- bundle exec rake spec:integration
expeditor:
@@ -267,10 +267,10 @@ steps:
- label: "Functional :ruby: 2.6"
commands:
+ - gem install bundler -v 2.1.4 # match Ruby 2.7 bundler
- /workdir/.expeditor/scripts/bk_container_prep.sh
- apt-get update -y
- apt-get install -y cron locales net-tools # needed for functional tests to pass
- - gem install bundler -v 2.1.4 # match Ruby 2.7 bundler
- bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package
- bundle exec rake spec:functional
expeditor:
@@ -281,8 +281,8 @@ steps:
- label: "Unit :ruby: 2.6"
commands:
- - /workdir/.expeditor/scripts/bk_container_prep.sh
- gem install bundler -v 2.1.4 # match Ruby 2.7 bundler
+ - /workdir/.expeditor/scripts/bk_container_prep.sh
- bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package
- bundle exec rake spec:unit
- bundle exec rake component_specs