Move all the CI scripts into the .expeditor dir

There's no reason to store all our test stuff at the top level when this all used by the Expeditor / BK jobs

Signed-off-by: Tim Smith <tsmith@chef.io>

13 files changed, 52 insertions, 52 deletions

diff --git a/.expeditor/habitat-test.pipeline.yml b/.expeditor/habitat-test.pipeline.yml
index 7d2cc8f653..859d4eb1f1 100644
--- a/.expeditor/habitat-test.pipeline.yml
+++ b/.expeditor/habitat-test.pipeline.yml
@@ -11,7 +11,7 @@ steps:
 
 - label: ":linux: Validate Linux"
   commands:
-    - sudo ./scripts/ci/install-hab.sh x86_64-linux
+    - sudo ./.expeditor/scripts/install-hab.sh x86_64-linux
     - 'echo "--- :hammer_and_wrench: Installing $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64LINUX"'
     - sudo hab pkg install $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64LINUX
     - sudo ./habitat/tests/test.sh $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64LINUX
@@ -23,7 +23,7 @@ steps:
 
 - label: ":linux: Validate Linux (kernel2)"
   commands:
-    - sudo ./scripts/ci/install-hab.sh x86_64-linux-kernel2
+    - sudo ./.expeditor/scripts/install-hab.sh x86_64-linux-kernel2
     - 'echo "--- :hammer_and_wrench: Installing $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64LINUXKERNEL2"'
     - sudo hab pkg install $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64LINUXKERNEL2
     - sudo ./habitat/tests/test.sh $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64LINUXKERNEL2
@@ -35,7 +35,7 @@ steps:
 
 - label: ":windows: Validate Habitat Builds of Chef Infra"
   commands:
-    - powershell -File ./scripts/ci/ensure-minimum-viable-hab.ps1
+    - powershell -File ./.expeditor/scripts/ensure-minimum-viable-hab.ps1
     - 'Write-Host "--- :hammer_and_wrench: Installing $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64WINDOWS"'
     - hab pkg install $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64WINDOWS
     - powershell -File ./habitat/tests/test.ps1 -PackageIdentifier $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64WINDOWS
diff --git a/scripts/bk_tests/bk_container_prep.sh b/.expeditor/scripts/bk_container_prep.sh
index 949f75c0d3..949f75c0d3 100755
--- a/scripts/bk_tests/bk_container_prep.sh
+++ b/.expeditor/scripts/bk_container_prep.sh
diff --git a/scripts/bk_tests/bk_linux_exec.sh b/.expeditor/scripts/bk_linux_exec.sh
index 415f646a3c..415f646a3c 100755
--- a/scripts/bk_tests/bk_linux_exec.sh
+++ b/.expeditor/scripts/bk_linux_exec.sh
diff --git a/scripts/bk_tests/bk_run_choco.ps1 b/.expeditor/scripts/bk_run_choco.ps1
index 49f9186701..49f9186701 100644
--- a/scripts/bk_tests/bk_run_choco.ps1
+++ b/.expeditor/scripts/bk_run_choco.ps1
diff --git a/scripts/bk_tests/bk_win_functional.ps1 b/.expeditor/scripts/bk_win_functional.ps1
index 3cc38f0b37..3cc38f0b37 100644
--- a/scripts/bk_tests/bk_win_functional.ps1
+++ b/.expeditor/scripts/bk_win_functional.ps1
diff --git a/scripts/bk_tests/bk_win_integration.ps1 b/.expeditor/scripts/bk_win_integration.ps1
index 6b0debc790..6b0debc790 100644
--- a/scripts/bk_tests/bk_win_integration.ps1
+++ b/.expeditor/scripts/bk_win_integration.ps1
diff --git a/scripts/bk_tests/bk_win_prep.ps1 b/.expeditor/scripts/bk_win_prep.ps1
index 1a09378fee..1a09378fee 100644
--- a/scripts/bk_tests/bk_win_prep.ps1
+++ b/.expeditor/scripts/bk_win_prep.ps1
diff --git a/scripts/bk_tests/bk_win_unit.ps1 b/.expeditor/scripts/bk_win_unit.ps1
index f1f28ade05..f1f28ade05 100644
--- a/scripts/bk_tests/bk_win_unit.ps1
+++ b/.expeditor/scripts/bk_win_unit.ps1
diff --git a/scripts/ci/ensure-minimum-viable-hab.ps1 b/.expeditor/scripts/ensure-minimum-viable-hab.ps1
index 10bfeb0fa8..10bfeb0fa8 100644
--- a/scripts/ci/ensure-minimum-viable-hab.ps1
+++ b/.expeditor/scripts/ensure-minimum-viable-hab.ps1
diff --git a/scripts/ci/install-hab.sh b/.expeditor/scripts/install-hab.sh
index 75e910bfab..75e910bfab 100755
--- a/scripts/ci/install-hab.sh
+++ b/.expeditor/scripts/install-hab.sh
diff --git a/scripts/ci/verify-plan.ps1 b/.expeditor/scripts/verify-plan.ps1
index bf206fab9c..614d472964 100644
--- a/scripts/ci/verify-plan.ps1
+++ b/.expeditor/scripts/verify-plan.ps1
@@ -12,7 +12,7 @@ $Plan = 'chef-infra-client'
 
 Write-Host "--- :8ball: :windows: Verifying $Plan"
 
-powershell -File "./scripts/ci/ensure-minimum-viable-hab.ps1"
+powershell -File "./.expeditor/scripts/ensure-minimum-viable-hab.ps1"
 if (-not $?) { throw "Could not ensure the minimum hab version required is installed." }
 
 Write-Host "--- :key: Generating fake origin key"
diff --git a/scripts/ci/verify-plan.sh b/.expeditor/scripts/verify-plan.sh
index b207334267..b207334267 100755
--- a/scripts/ci/verify-plan.sh
+++ b/.expeditor/scripts/verify-plan.sh
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 46be10c14f..5dedd278b4 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -17,7 +17,7 @@ steps:
 
 - label: "Integration Ubuntu 18.04 :ruby: 2.7"
   commands:
-    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - /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
   expeditor:
@@ -28,7 +28,7 @@ steps:
 
 - label: "Functional Ubuntu 18.04 :ruby: 2.7"
   commands:
-    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep.sh
     - apt-get update -y
     - 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
@@ -41,7 +41,7 @@ steps:
 
 - label: "Unit Ubuntu 18.04 :ruby: 2.7"
   commands:
-    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep.sh
     - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
     - bundle exec rake spec:unit
     - bundle exec rake component_specs
@@ -52,7 +52,7 @@ steps:
 
 - label: "Integration Ubuntu 20.04 :ruby: 2.7"
   commands:
-    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - /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
   expeditor:
@@ -63,7 +63,7 @@ steps:
 
 - label: "Functional Ubuntu 20.04 :ruby: 2.7"
   commands:
-    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep.sh
     - apt-get update -y
     - 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
@@ -76,7 +76,7 @@ steps:
 
 - label: "Unit Ubuntu 20.04 :ruby: 2.7"
   commands:
-    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep.sh
     - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
     - bundle exec rake spec:unit
     - bundle exec rake component_specs
@@ -87,7 +87,7 @@ steps:
 
 - label: "Integration CentOS 7 :ruby: 2.7"
   commands:
-    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - /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
   expeditor:
@@ -98,7 +98,7 @@ steps:
 
 - label: "Functional CentOS 7 :ruby: 2.7"
   commands:
-    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep.sh
     - yum install -y crontabs e2fsprogs util-linux
     - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
     - bundle exec rake spec:functional
@@ -110,7 +110,7 @@ steps:
 
 - label: "Unit CentOS 7 :ruby: 2.7"
   commands:
-    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep.sh
     - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
     - bundle exec rake spec:unit
     - bundle exec rake component_specs
@@ -121,7 +121,7 @@ steps:
 
 - label: "Integration openSUSE 15 :ruby: 2.7"
   commands:
-    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep.sh
     - 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
@@ -133,7 +133,7 @@ steps:
 
 - label: "Functional openSUSE 15 :ruby: 2.7"
   commands:
-    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep.sh
     - 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
@@ -145,7 +145,7 @@ steps:
 
 - label: "Unit openSUSE 15 :ruby: 2.7"
   commands:
-    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep.sh
     - zypper install -y cron insserv-compat
     - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
     - bundle exec rake spec:unit
@@ -157,7 +157,7 @@ steps:
 
 - label: "Integration Fedora :ruby: 2.7"
   commands:
-    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - /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
   expeditor:
@@ -168,7 +168,7 @@ steps:
 
 - label: "Functional Fedora :ruby: 2.7"
   commands:
-    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep.sh
     - yum install -y crontabs e2fsprogs util-linux
     - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
     - bundle exec rake spec:functional
@@ -183,7 +183,7 @@ steps:
 
 - label: "Unit Fedora :ruby: 2.7"
   commands:
-    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep.sh
     - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
     - bundle exec rake spec:unit
     - bundle exec rake component_specs
@@ -194,7 +194,7 @@ steps:
 
 - label: "Functional Windows :ruby: 2.7"
   commands:
-    - scripts/bk_tests/bk_win_functional.ps1
+    - .expeditor/scripts/bk_win_functional.ps1
   expeditor:
     executor:
       windows:
@@ -204,7 +204,7 @@ steps:
 
 - label: "Integration Windows :ruby: 2.7"
   commands:
-    - /workdir/scripts/bk_tests/bk_win_integration.ps1
+    - /workdir/.expeditor/scripts/bk_win_integration.ps1
   expeditor:
     executor:
       docker:
@@ -217,7 +217,7 @@ steps:
 
 - label: "Chocolatey Windows :ruby: 2.7"
   commands:
-    - /workdir/scripts/bk_tests/bk_run_choco.ps1
+    - /workdir/.expeditor/scripts/bk_run_choco.ps1
   expeditor:
     executor:
       docker:
@@ -227,7 +227,7 @@ steps:
 
 - label: "Unit Windows :ruby: 2.7"
   commands:
-    - /workdir/scripts/bk_tests/bk_win_unit.ps1
+    - /workdir/.expeditor/scripts/bk_win_unit.ps1
   expeditor:
     executor:
       docker:
@@ -244,7 +244,7 @@ steps:
 
 - label: "Chefstyle :ruby: 2.6"
   commands:
-    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - /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:
@@ -254,7 +254,7 @@ steps:
 
 - label: "Integration :ruby: 2.6"
   commands:
-    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - /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:
@@ -265,7 +265,7 @@ steps:
 
 - label: "Functional :ruby: 2.6"
   commands:
-    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - /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
     - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package
@@ -278,7 +278,7 @@ steps:
 
 - label: "Unit :ruby: 2.6"
   commands:
-    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - /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
@@ -293,7 +293,7 @@ steps:
 
 - label: "chef-sugar gem :ruby: 2.7"
   commands:
-    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep.sh
     - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package
     - bundle exec tasks/bin/run_external_test chef/chef-sugar master rake
   expeditor:
@@ -303,7 +303,7 @@ steps:
 
 - label: "chef-zero gem :ruby: 2.7"
   commands:
-    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep.sh
     - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package
     - bundle exec tasks/bin/run_external_test chef/chef-zero master rake pedant
   expeditor:
@@ -316,7 +316,7 @@ steps:
 
 - label: "cheffish gem :ruby: 2.7"
   commands:
-    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep.sh
     - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package
     - bundle exec tasks/bin/run_external_test chef/cheffish master rake spec
   expeditor:
@@ -326,7 +326,7 @@ steps:
 
 - label: "chefspec gem :ruby: 2.7"
   commands:
-    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep.sh
     - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package
     - bundle exec tasks/bin/run_external_test chefspec/chefspec master rake
   expeditor:
@@ -336,7 +336,7 @@ steps:
 
 - label: "knife-windows gem :ruby: 2.7"
   commands:
-    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep.sh
     - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package
     - bundle exec tasks/bin/run_external_test chef/knife-windows master rake spec
   expeditor:
@@ -346,7 +346,7 @@ steps:
 
 - label: "berkshelf gem :ruby: 2.7"
   commands:
-    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/bk_container_prep.sh
     - apt-get update -y
     - apt-get install -y graphviz
     - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package
@@ -362,7 +362,7 @@ steps:
 
 - label: "Kitchen: Amazon Linux 201X"
   commands:
-    - scripts/bk_tests/bk_linux_exec.sh
+    - .expeditor/scripts/bk_linux_exec.sh
     - cd kitchen-tests
     - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-amazonlinux
   artifact_paths:
@@ -377,7 +377,7 @@ steps:
 
 - label: "Kitchen: Amazon Linux 2"
   commands:
-    - scripts/bk_tests/bk_linux_exec.sh
+    - .expeditor/scripts/bk_linux_exec.sh
     - cd kitchen-tests
     - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-amazonlinux-2
   artifact_paths:
@@ -392,7 +392,7 @@ steps:
 
 - label: "Kitchen: Ubuntu 18.04"
   commands:
-    - scripts/bk_tests/bk_linux_exec.sh
+    - .expeditor/scripts/bk_linux_exec.sh
     - cd kitchen-tests
     - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-ubuntu-1804
   artifact_paths:
@@ -407,7 +407,7 @@ steps:
 
 - label: "Kitchen: Ubuntu 20.04"
   commands:
-    - scripts/bk_tests/bk_linux_exec.sh
+    - .expeditor/scripts/bk_linux_exec.sh
     - cd kitchen-tests
     - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-ubuntu-2004
   artifact_paths:
@@ -422,7 +422,7 @@ steps:
 
 - label: "Kitchen: Ubuntu 20.10"
   commands:
-    - scripts/bk_tests/bk_linux_exec.sh
+    - .expeditor/scripts/bk_linux_exec.sh
     - cd kitchen-tests
     - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-ubuntu-2010
   artifact_paths:
@@ -437,7 +437,7 @@ steps:
 
 - label: "Kitchen: Debian 9"
   commands:
-    - scripts/bk_tests/bk_linux_exec.sh
+    - .expeditor/scripts/bk_linux_exec.sh
     - cd kitchen-tests
     - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-debian-9
   artifact_paths:
@@ -452,7 +452,7 @@ steps:
 
 - label: "Kitchen: Debian 10"
   commands:
-    - scripts/bk_tests/bk_linux_exec.sh
+    - .expeditor/scripts/bk_linux_exec.sh
     - cd kitchen-tests
     - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-debian-10
   artifact_paths:
@@ -467,7 +467,7 @@ steps:
 
 - label: "Kitchen: CentOS 6"
   commands:
-    - scripts/bk_tests/bk_linux_exec.sh
+    - .expeditor/scripts/bk_linux_exec.sh
     - cd kitchen-tests
     - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-centos-6
   artifact_paths:
@@ -482,7 +482,7 @@ steps:
 
 - label: "Kitchen: CentOS 7"
   commands:
-    - scripts/bk_tests/bk_linux_exec.sh
+    - .expeditor/scripts/bk_linux_exec.sh
     - cd kitchen-tests
     - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-centos-7
   artifact_paths:
@@ -497,7 +497,7 @@ steps:
 
 - label: "Kitchen: CentOS 8"
   commands:
-    - scripts/bk_tests/bk_linux_exec.sh
+    - .expeditor/scripts/bk_linux_exec.sh
     - cd kitchen-tests
     - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-centos-8
   artifact_paths:
@@ -512,7 +512,7 @@ steps:
 
 - label: "Kitchen: Oracle Linux 7"
   commands:
-    - scripts/bk_tests/bk_linux_exec.sh
+    - .expeditor/scripts/bk_linux_exec.sh
     - cd kitchen-tests
     - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-oraclelinux-7
   artifact_paths:
@@ -527,7 +527,7 @@ steps:
 
 - label: "Kitchen: Oracle Linux 8"
   commands:
-    - scripts/bk_tests/bk_linux_exec.sh
+    - .expeditor/scripts/bk_linux_exec.sh
     - cd kitchen-tests
     - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-oraclelinux-8
   artifact_paths:
@@ -542,7 +542,7 @@ steps:
 
 - label: "Kitchen: Fedora latest"
   commands:
-    - scripts/bk_tests/bk_linux_exec.sh
+    - .expeditor/scripts/bk_linux_exec.sh
     - cd kitchen-tests
     - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-fedora-latest
   artifact_paths:
@@ -557,7 +557,7 @@ steps:
 
 - label: "Kitchen: openSUSE Leap: 15"
   commands:
-    - scripts/bk_tests/bk_linux_exec.sh
+    - .expeditor/scripts/bk_linux_exec.sh
     - cd kitchen-tests
     - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-opensuse-leap-15
   artifact_paths:
@@ -581,8 +581,8 @@ steps:
 
 - label: ":habicat: Linux plan"
   commands:
-    - sudo ./scripts/ci/install-hab.sh 'x86_64-linux'
-    - sudo ./scripts/ci/verify-plan.sh
+    - sudo ./.expeditor/scripts/install-hab.sh 'x86_64-linux'
+    - sudo ./.expeditor/scripts/verify-plan.sh
   timeout_in_minutes: 60
   expeditor:
     executor:
@@ -592,8 +592,8 @@ steps:
 
 - label: ":habicat: Linux plan (kernel2)"
   commands:
-    - sudo ./scripts/ci/install-hab.sh 'x86_64-linux-kernel2'
-    - sudo ./scripts/ci/verify-plan.sh
+    - sudo ./.expeditor/scripts/install-hab.sh 'x86_64-linux-kernel2'
+    - sudo ./.expeditor/scripts/verify-plan.sh
   timeout_in_minutes: 60
   expeditor:
     executor:
@@ -603,7 +603,7 @@ steps:
 
 - label: ":habicat: Windows plan"
   commands:
-    - ./scripts/ci/verify-plan.ps1
+    - ./.expeditor/scripts/verify-plan.ps1
   timeout_in_minutes: 60
   expeditor:
     executor: