Merge pull request #10799 from chef/ci_cleanup

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

16 files changed, 122 insertions, 126 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..e065f20579 100755
--- a/scripts/bk_tests/bk_container_prep.sh
+++ b/.expeditor/scripts/bk_container_prep.sh
@@ -1,6 +1,16 @@
 # This script gets a container ready to run our various tests in BuildKite
 
-echo "--- preparing..."
+echo "--- Container Config..."
+
+source /etc/os-release
+echo $PRETTY_NAME
+
+echo "ruby version:"
+ruby -v
+echo "bundler version:"
+bundle -v
+
+echo "--- Preparing Container..."
 
 export FORCE_FFI_YAJL="ext"
 export CHEF_LICENSE="accept-no-persist"
@@ -11,11 +21,7 @@ if [ -f /etc/debian_version ]; then
   touch /etc/network/interfaces
 fi
 
-# make sure we have the omnibus_overrides specified version of rubygems / bundler
-echo "--- Install proper bundler"
-gem uninstall bundler -a -x || true
-gem install bundler -v $(grep :bundler omnibus_overrides.rb | cut -d'"' -f2)
-bundle --version
+# remove default bundler config if there is one
 rm -f .bundle/config
 
 echo "+++ Run tests"
diff --git a/scripts/bk_tests/bk_linux_exec.sh b/.expeditor/scripts/bk_linux_exec.sh
index 415f646a3c..f1202bbcbb 100755
--- a/scripts/bk_tests/bk_linux_exec.sh
+++ b/.expeditor/scripts/bk_linux_exec.sh
@@ -31,8 +31,10 @@ echo "--- Config information"
 
 echo "!!!! RUBY VERSION !!!!"
 ruby --version
-echo "!!!! BUNDLE LOCATION !!!!"
+echo "!!!! BUNDLER LOCATION !!!!"
 which bundle
+echo "!!!! BUNDLER VERSION !!!!"
+bundle -v
 echo "!!!! DOCKER VERSION !!!!"
 docker version
 echo "!!!! DOCKER STATUS !!!!"
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..05f8e57248 100644
--- a/scripts/bk_tests/bk_win_functional.ps1
+++ b/.expeditor/scripts/bk_win_functional.ps1
@@ -8,6 +8,7 @@ Remove-Item -Path C:\ProgramData\chocolatey\bin\choco.exe -ErrorAction SilentlyC
 $ErrorActionPreference = 'Stop'
 
 Write-Output "--- Enable Ruby 2.7"
+
 Write-Output "Add Uru to Environment PATH"
 $env:PATH = "C:\Program Files (x86)\Uru;" + $env:PATH
 [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine)
@@ -16,26 +17,15 @@ 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?" }
-
-Write-Output "--- configure winrm"
-
-winrm quickconfig -q
-
-Write-Output "--- update bundler"
-
 ruby -v
 if (-not $?) { throw "Can't run Ruby. Is it installed?" }
 
-$env:BUNDLER_VERSION=$(findstr bundler omnibus_overrides.rb | %{ $_.split(" ")[3] })
-$env:BUNDLER_VERSION=($env:BUNDLER_VERSION -replace '"', "")
-Write-Output $env:BUNDLER_VERSION
-
-gem install bundler -v $env:BUNDLER_VERSION --force --no-document --quiet
-if (-not $?) { throw "Unable to update Bundler" }
-bundle --version
+Write-Output "--- configure winrm"
+winrm quickconfig -q
 
 Write-Output "--- bundle install"
-bundle install --jobs=3 --retry=3 --without omnibus_package
+bundle config set --local without 'omnibus_package'
+bundle install --jobs=3 --retry=3
 if (-not $?) { throw "Unable to install gem dependencies" }
 
 Write-Output "+++ bundle exec rake spec:functional"
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/.expeditor/scripts/bk_win_prep.ps1 b/.expeditor/scripts/bk_win_prep.ps1
new file mode 100644
index 0000000000..37796da468
--- /dev/null
+++ b/.expeditor/scripts/bk_win_prep.ps1
@@ -0,0 +1,15 @@
+echo "--- system details"
+$Properties = 'Caption', 'CSName', 'Version', 'BuildType', 'OSArchitecture'
+Get-CimInstance Win32_OperatingSystem | Select-Object $Properties | Format-Table -AutoSize
+
+echo "ruby version:"
+ruby -v
+if (-not $?) { throw "Can't run Ruby. Is it installed?" }
+
+echo "bundler version: "
+bundle --version
+if (-not $?) { throw "Can't run Bundler. Is it installed?" }
+
+echo "--- bundle install"
+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
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 272c3ad8af..efba47cd86 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,8 +98,8 @@ steps:
 
 - label: "Functional CentOS 7 :ruby: 2.7"
   commands:
-    - /workdir/scripts/bk_tests/bk_container_prep.sh
-    - yum install -y crontabs e2fsprogs util-linux
+    - /workdir/.expeditor/scripts/bk_container_prep.sh
+    - 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
   expeditor:
@@ -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,8 +168,8 @@ steps:
 
 - label: "Functional Fedora :ruby: 2.7"
   commands:
-    - /workdir/scripts/bk_tests/bk_container_prep.sh
-    - yum install -y crontabs e2fsprogs util-linux
+    - /workdir/.expeditor/scripts/bk_container_prep.sh
+    - 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
   expeditor:
@@ -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,8 @@ steps:
 
 - label: "Chefstyle :ruby: 2.6"
   commands:
-    - /workdir/scripts/bk_tests/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:
@@ -254,7 +255,8 @@ steps:
 
 - label: "Integration :ruby: 2.6"
   commands:
-    - /workdir/scripts/bk_tests/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:
@@ -265,7 +267,8 @@ steps:
 
 - label: "Functional :ruby: 2.6"
   commands:
-    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - 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
     - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package
@@ -278,7 +281,8 @@ steps:
 
 - label: "Unit :ruby: 2.6"
   commands:
-    - /workdir/scripts/bk_tests/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
@@ -293,7 +297,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 +307,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,17 +320,17 @@ 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:
     executor:
       docker:
-        image: rubydistros/ubuntu-18.04:2.6
+        image: rubydistros/ubuntu-18.04:2.7
 
 - 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 +340,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 +350,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
@@ -360,24 +364,9 @@ steps:
   # START TEST KITCHEN ONLY
 #########################################################################
 
-- label: "Kitchen: Amazon Linux 201X"
-  commands:
-    - scripts/bk_tests/bk_linux_exec.sh
-    - cd kitchen-tests
-    - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-amazonlinux
-  artifact_paths:
-    - $PWD/.kitchen/logs/kitchen.log
-  env:
-      KITCHEN_YAML: kitchen.yml
-  expeditor:
-    executor:
-      linux:
-        privileged: true
-        single-use: true
-
 - 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:
@@ -408,7 +397,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:
@@ -423,7 +412,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:
@@ -436,11 +425,11 @@ steps:
         privileged: true
         single-use: true
 
-- label: "Kitchen: Ubuntu 20.10"
+- label: "Kitchen: Ubuntu 21.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-2010
+    - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-ubuntu-2104
   artifact_paths:
     - $PWD/.kitchen/logs/kitchen.log
   env:
@@ -453,7 +442,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:
@@ -468,7 +457,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:
@@ -481,9 +470,24 @@ steps:
         privileged: true
         single-use: true
 
+- label: "Kitchen: Debian 11"
+  commands:
+    - .expeditor/scripts/bk_linux_exec.sh
+    - cd kitchen-tests
+    - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-debian-11
+  artifact_paths:
+    - $PWD/.kitchen/logs/kitchen.log
+  env:
+      KITCHEN_YAML: kitchen.yml
+  expeditor:
+    executor:
+      linux:
+        privileged: true
+        single-use: true
+
 - 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:
@@ -498,7 +502,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:
@@ -513,7 +517,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:
@@ -528,7 +532,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:
@@ -543,7 +547,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:
@@ -558,7 +562,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:
@@ -573,7 +577,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:
@@ -597,8 +601,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:
@@ -608,8 +612,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:
@@ -619,7 +623,7 @@ steps:
 
 - label: ":habicat: Windows plan"
   commands:
-    - ./scripts/ci/verify-plan.ps1
+    - ./.expeditor/scripts/verify-plan.ps1
   timeout_in_minutes: 60
   expeditor:
     executor:
diff --git a/kitchen-tests/kitchen.yml b/kitchen-tests/kitchen.yml
index 06270987b3..beffc077f6 100644
--- a/kitchen-tests/kitchen.yml
+++ b/kitchen-tests/kitchen.yml
@@ -20,7 +20,6 @@ lifecycle:
     - remote: echo "Chef container's Chef / Ohai release:"
     - remote: /opt/chef/bin/chef-client -v
     - remote: /opt/chef/bin/ohai -v
-    - remote: /opt/chef/embedded/bin/bundle -v
     - remote: /opt/chef/embedded/bin/gem install appbundler appbundle-updater --no-doc
     - remote: /opt/chef/embedded/bin/appbundle-updater chef ohai <%= File.readlines('../Gemfile.lock', File.expand_path(File.dirname(__FILE__))).find { |l| l =~ /^\s+ohai \((\d+\.\d+\.\d+)\)/ }; 'v' + $1 %> --tarball --github chef/ohai
     - remote: /opt/chef/embedded/bin/appbundle-updater chef chef <%= ENV['BUILDKITE_COMMIT']  || %x(git rev-parse HEAD).chomp %> --tarball --github chef/chef
@@ -33,13 +32,6 @@ verifier:
   format: progress
 
 platforms:
-- name: amazonlinux
-  driver:
-    image: dokken/amazonlinux
-    pid_one_command: /sbin/init
-    intermediate_instructions:
-      - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults    !requiretty/g" /etc/sudoers
-
 - name: amazonlinux-2
   driver:
     image: dokken/amazonlinux-2
@@ -63,13 +55,22 @@ platforms:
       - RUN /usr/bin/apt-get update
       - RUN /usr/bin/apt-get install ifupdown -y # we need this for /etc/network/interfaces & ifconfig resource
 
+- name: debian-11
+  driver:
+    image: dokken/debian-11
+    pid_one_command: /bin/systemd
+    intermediate_instructions:
+      - RUN /usr/bin/apt-get update
+      - RUN /usr/bin/apt-get install ifupdown -y # we need this for /etc/network/interfaces & ifconfig resource
+
 - name: centos-6
   driver:
     image: dokken/centos-6
     pid_one_command: /sbin/init
     intermediate_instructions:
       - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults    !requiretty/g" /etc/sudoers
-      - RUN yum install -y centos-release-scl
+      - RUN wget -O /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-SCLo
+      - RUN printf "[centos-sclo-rh]\nname=CentOS-6 - SCLo rh\nbaseurl=http://vault.centos.org/centos/6/sclo/x86_64/rh\ngpgcheck=1\nenabled=1\ngpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo" > /etc/yum.repos.d/CentOS-SCLo-rh.repo
       - RUN yum install -y devtoolset-7
       - RUN scl enable devtoolset-7 bash
 
@@ -137,9 +138,9 @@ platforms:
       - RUN /usr/bin/apt-get update
       - RUN /usr/bin/apt-get install ifupdown -y # we need this for /etc/network/interfaces & ifconfig resource testing
 
-- name: ubuntu-20.10
+- name: ubuntu-21.04
   driver:
-    image: dokken/ubuntu-20.10
+    image: dokken/ubuntu-21.04
     pid_one_command: /bin/systemd
     intermediate_instructions:
       - RUN /usr/bin/apt-get update
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index b7d515341a..498a1ab612 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -3,8 +3,6 @@
 #
 # NOTE: You MUST update omnibus-software when adding new versions of
 # software here: bundle exec rake dependencies:update_omnibus_gemfile_lock
-override :rubygems, version: "3.1.4" # pin to what ships in the ruby version
-override :bundler, version: "2.1.4" # pin to what ships in the ruby version
 override "libarchive", version: "3.5.0"
 override "libffi", version: "3.3"
 override "libiconv", version: "1.16"
diff --git a/scripts/bk_tests/bk_win_prep.ps1 b/scripts/bk_tests/bk_win_prep.ps1
deleted file mode 100644
index 1a09378fee..0000000000
--- a/scripts/bk_tests/bk_win_prep.ps1
+++ /dev/null
@@ -1,20 +0,0 @@
-echo "--- system details"
-$Properties = 'Caption', 'CSName', 'Version', 'BuildType', 'OSArchitecture'
-Get-CimInstance Win32_OperatingSystem | Select-Object $Properties | Format-Table -AutoSize
-
-echo "--- update bundler"
-
-ruby -v
-if (-not $?) { throw "Can't run Ruby. Is it installed?" }
-
-$env:BUNDLER_VERSION=$(findstr bundler omnibus_overrides.rb | %{ $_.split(" ")[3] })
-$env:BUNDLER_VERSION=($env:BUNDLER_VERSION -replace '"', "")
-echo $env:BUNDLER_VERSION
-
-gem install bundler -v $env:BUNDLER_VERSION --force --no-document --quiet
-if (-not $?) { throw "Unable to update Bundler" }
-bundle --version
-
-echo "--- bundle install"
-bundle install --jobs=3 --retry=3 --without omnibus_package
-if (-not $?) { throw "Unable to install gem dependencies" }