teach expeditor about new test locations

Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>

5 files changed, 68 insertions, 7 deletions

diff --git a/.expeditor/scripts/bk_win_functional.ps1 b/.expeditor/scripts/bk_win_functional.ps1
index 05f8e57248..5a4e195480 100644
--- a/.expeditor/scripts/bk_win_functional.ps1
+++ b/.expeditor/scripts/bk_win_functional.ps1
@@ -23,11 +23,20 @@ if (-not $?) { throw "Can't run Ruby. Is it installed?" }
 Write-Output "--- configure winrm"
 winrm quickconfig -q
 
+# TODO - why not using bk_pwin_prop which does all this?
 Write-Output "--- bundle install"
 bundle config set --local without 'omnibus_package'
 bundle install --jobs=3 --retry=3
-if (-not $?) { throw "Unable to install gem dependencies" }
+if (-not $?) { throw "Unable to install gem dependencies (chef-client)" }
 
-Write-Output "+++ bundle exec rake spec:functional"
+Write-Output "+++ bundle exec rake spec:functional (chef-client) "
 bundle exec rake spec:functional
-if (-not $?) { throw "Chef functional specs failing." }
+if (-not $?) { throw "chef-client functional specs failing." }
+Write-Output "+++ bundle exec rake spec:functional (knife)"
+
+cd knife
+bundle config set --local without 'omnibus_package'
+bundle install --jobs=3 --retry=3
+if (-not $?) { throw "Unable to install gem dependencies (knife)" }
+bundle exec rake spec:functional
+if (-not $?) { throw "knife functional specs failing." }
diff --git a/.expeditor/scripts/bk_win_integration.ps1 b/.expeditor/scripts/bk_win_integration.ps1
index 6b0debc790..ede73a1b99 100644
--- a/.expeditor/scripts/bk_win_integration.ps1
+++ b/.expeditor/scripts/bk_win_integration.ps1
@@ -7,6 +7,10 @@ $Env:Path="C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\ruby
 
 winrm quickconfig -q
 
-echo "+++ bundle exec rake spec:integration"
+echo "+++ bundle exec rake spec:integration (chef-client) (chef-client) (chef-client) (chef-client) (chef-client) (chef-client) (chef-client) (chef-client) (chef-client)"
 bundle exec rake spec:integration
 if (-not $?) { throw "Chef integration specs failing." }
+
+echo "+++ bundle exec rake spec:integration (knife)"
+bundle exec rake spec:integration
+if (-not $?) { throw "knife integration specs failing." }
diff --git a/.expeditor/scripts/bk_win_prep.ps1 b/.expeditor/scripts/bk_win_prep.ps1
index 37796da468..7153f8ad55 100644
--- a/.expeditor/scripts/bk_win_prep.ps1
+++ b/.expeditor/scripts/bk_win_prep.ps1
@@ -10,6 +10,14 @@ echo "bundler version: "
 bundle --version
 if (-not $?) { throw "Can't run Bundler. Is it installed?" }
 
-echo "--- bundle install"
+echo "--- bundle install (chef-client)"
 bundle install --jobs=3 --retry=3  --path=vendor/bundle --without omnibus_package
-if (-not $?) { throw "Unable to install gem dependencies" }
\ No newline at end of file
+if (-not $?) { throw "Unable to install gem dependencies (chef client)" }
+
+echo "--- bundle install (chef-client)"
+
+cd /knife
+bundle install --jobs=3 --retry=3  --path=vendor/bundle --without omnibus_package
+if (-not $?) { throw "Unable to install gem dependencies (knife)" }
+cd ..
+
diff --git a/.expeditor/scripts/bk_win_unit.ps1 b/.expeditor/scripts/bk_win_unit.ps1
index f1f28ade05..f5a073dc60 100644
--- a/.expeditor/scripts/bk_win_unit.ps1
+++ b/.expeditor/scripts/bk_win_unit.ps1
@@ -2,8 +2,12 @@ $CurrentDirectory = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
 $PrepScript = Join-Path $CurrentDirectory "bk_win_prep.ps1"
 Invoke-Expression $PrepScript
 
-echo "+++ bundle exec rake"
+echo "+++ bundle exec rake (chef-client)"
 bundle exec rake spec:unit
 if (-not $?) { throw "Chef unit tests failing." }
 bundle exec rake component_specs
 if (-not $?) { throw "Chef component specs failing." }
+cd knife
+echo "+++ bundle exec rake (knife)"
+bundle exec rake spec:unit
+if (-not $?) { throw "Knife unit tests failing." }
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 041a5c3269..04f9b2c34a 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -46,6 +46,10 @@ steps:
     - /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
+    - cd /workdir/knife
+    - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
+    - bundle exec rake style
+
   expeditor:
     executor:
       docker:
@@ -56,6 +60,8 @@ steps:
     - /workdir/.expeditor/scripts/bk_container_prep.sh
     - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package
     - bundle exec rake spec:integration
+    - cd /workdir/knife; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package
+    - bundle exec rake spec:integration
   expeditor:
     executor:
       docker:
@@ -69,6 +75,8 @@ steps:
     - apt-get install -y cron locales # needed for functional tests to pass
     - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
     - bundle exec rake spec:functional
+    - cd /workdir/knife; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
+    - bundle exec rake spec:functional
   expeditor:
     executor:
       docker:
@@ -81,6 +89,9 @@ steps:
     - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
     - bundle exec rake spec:unit
     - bundle exec rake component_specs
+    - cd /workdir/knife
+    - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
+    - bundle exec rake spec:unit
   expeditor:
     executor:
       docker:
@@ -91,6 +102,8 @@ steps:
     - /workdir/.expeditor/scripts/bk_container_prep.sh
     - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package
     - bundle exec rake spec:integration
+    - cd /workdir/knife; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package
+    - bundle exec rake spec:integration
   expeditor:
     executor:
       docker:
@@ -104,6 +117,8 @@ steps:
     - apt-get install -y cron locales # needed for functional tests to pass
     - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
     - bundle exec rake spec:functional
+    - cd /workdir/knife; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
+    - bundle exec rake spec:functional
   expeditor:
     executor:
       docker:
@@ -116,6 +131,9 @@ steps:
     - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
     - bundle exec rake spec:unit
     - bundle exec rake component_specs
+    - cd /workdir/knife
+    - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
+    - bundle exec rake spec:unit
   expeditor:
     executor:
       docker:
@@ -126,6 +144,8 @@ steps:
     - /workdir/.expeditor/scripts/bk_container_prep.sh
     - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package
     - bundle exec rake spec:integration
+    - cd /workdir/knife; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package
+    - bundle exec rake spec:integration
   expeditor:
     executor:
       docker:
@@ -138,6 +158,8 @@ steps:
     - yum install -y crontabs e2fsprogs
     - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
     - bundle exec rake spec:functional
+    - cd /workdir/knife; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
+    - bundle exec rake spec:functional
   expeditor:
     executor:
       docker:
@@ -150,6 +172,8 @@ steps:
     - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
     - bundle exec rake spec:unit
     - bundle exec rake component_specs
+    - cd /workdir/knife; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
+    - bundle exec rake spec:unit
   expeditor:
     executor:
       docker:
@@ -161,6 +185,8 @@ steps:
     - zypper install -y cron insserv-compat
     - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package
     - bundle exec rake spec:integration
+    - cd /workdir/knife; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package
+    - bundle exec rake spec:integration
   expeditor:
     executor:
       docker:
@@ -173,6 +199,8 @@ steps:
     - zypper install -y cronie insserv-compat
     - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
     - bundle exec rake spec:functional
+    - cd /workdir/knife; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
+    - bundle exec rake spec:functional
   expeditor:
     executor:
       docker:
@@ -186,6 +214,8 @@ steps:
     - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
     - bundle exec rake spec:unit
     - bundle exec rake component_specs
+    - cd workdir/knife; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
+    - bundle exec rake spec:unit
   expeditor:
     executor:
       docker:
@@ -196,6 +226,8 @@ steps:
     - /workdir/.expeditor/scripts/bk_container_prep.sh
     - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package
     - bundle exec rake spec:integration
+    - cd /workdir/knife; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package
+    - bundle exec rake spec:integration
   expeditor:
     executor:
       docker:
@@ -208,6 +240,8 @@ steps:
     - dnf install -y crontabs e2fsprogs
     - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
     - bundle exec rake spec:functional
+    - cd /workdir/knife; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
+    - bundle exec rake spec:functional
   expeditor:
     executor:
       docker:
@@ -223,6 +257,8 @@ steps:
     - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
     - bundle exec rake spec:unit
     - bundle exec rake component_specs
+    - cd /workdir/knife; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
+    - bundle exec rake spec:unit
   expeditor:
     executor:
       docker: