[drop] re-enable pipelines and include knife in component testsmp/knife-gem-specs-2

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

2 files changed, 447 insertions, 466 deletions

diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 6ba4ce274d..262d927d3d 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -111,466 +111,454 @@ steps:
       docker:
         image: rubydistros/ubuntu-20.04:3.0
 
-## TEMP - do not need once we re-add knife to component_tess
-- label: "Knife Ubuntu 20.04 :ruby: 3.0"
+- label: "Integration CentOS 7 :ruby: 3.0"
+  commands:
+    - /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:
+    executor:
+      docker:
+        image: rubydistros/centos-7:3.0
+        privileged: true
+
+- label: "Functional CentOS 7 :ruby: 3.0"
+  commands:
+    - /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:
+    executor:
+      docker:
+        image: rubydistros/centos-7:3.0
+        privileged: true
+
+- label: "Unit CentOS 7 :ruby: 3.0"
   commands:
     - /workdir/.expeditor/scripts/bk_container_prep.sh
-    - cd /workdir/knife
     - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
-    - bundle exec rake spec
+    - bundle exec rake spec:unit
+    - bundle exec rake component_specs
   expeditor:
     executor:
       docker:
-        image: rubydistros/ubuntu-20.04:3.0
+        image: rubydistros/centos-7:3.0
 
-# - label: "Integration CentOS 7 :ruby: 3.0"
-#   commands:
-#     - /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:
-#     executor:
-#       docker:
-#         image: rubydistros/centos-7:3.0
-#         privileged: true
-#
-# - label: "Functional CentOS 7 :ruby: 3.0"
-#   commands:
-#     - /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:
-#     executor:
-#       docker:
-#         image: rubydistros/centos-7:3.0
-#         privileged: true
-#
-# - label: "Unit CentOS 7 :ruby: 3.0"
-#   commands:
-#     - /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
-#   expeditor:
-#     executor:
-#       docker:
-#         image: rubydistros/centos-7:3.0
-#
-# - label: "Integration openSUSE 15 :ruby: 3.0"
-#   commands:
-#     - /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
-#   expeditor:
-#     executor:
-#       docker:
-#         image: rubydistros/opensuse-15:3.0
-#         privileged: true
-#
-# - label: "Functional openSUSE 15 :ruby: 3.0"
-#   commands:
-#     - /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
-#   expeditor:
-#     executor:
-#       docker:
-#         image: rubydistros/opensuse-15:3.0
-#         privileged: true
-#
-# - label: "Unit openSUSE 15 :ruby: 3.0"
-#   commands:
-#     - /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
-#     - bundle exec rake component_specs
-#   expeditor:
-#     executor:
-#       docker:
-#         image: rubydistros/opensuse-15:3.0
-#
-# - label: "Integration Fedora :ruby: 3.0"
-#   commands:
-#     - /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:
-#     executor:
-#       docker:
-#         image: rubydistros/fedora-latest:3.0
-#         privileged: true
-#
-# - label: "Functional Fedora :ruby: 3.0"
-#   commands:
-#     - /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:
-#     executor:
-#       docker:
-#         image: rubydistros/fedora-latest:3.0
-#         privileged: true
-#         environment:
-#           - FORCE_FFI_YAJL=ext
-#           - CHEF_LICENSE=accept-no-persist
-#
-# - label: "Unit Fedora :ruby: 3.0"
-#   commands:
-#     - /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
-#   expeditor:
-#     executor:
-#       docker:
-#         image: rubydistros/fedora-latest:3.0
-#
-# - label: "Functional Windows :ruby: 3.0"
-#   commands:
-#     - .expeditor/scripts/bk_win_functional.ps1
-#   expeditor:
-#     executor:
-#       windows:
-#         privileged: true
-#         single-use: true
-#         shell: ["powershell", "-Command"]
-#
-# - label: "Integration Windows :ruby: 3.0"
-#   commands:
-#     - /workdir/.expeditor/scripts/bk_win_integration.ps1
-#   expeditor:
-#     executor:
-#       docker:
-#         host_os: windows
-#         image: rubydistros/windows-2019:3.0
-#         environment:
-#           - FORCE_FFI_YAJL=ext
-#           - CHEF_LICENSE=accept-no-persist
-#         shell: ["powershell", "-Command"]
-#
-# - label: "Unit Windows :ruby: 3.0"
-#   commands:
-#     - /workdir/.expeditor/scripts/bk_win_unit.ps1
-#   expeditor:
-#     executor:
-#       docker:
-#         host_os: windows
-#         image: rubydistros/windows-2019:3.0
-#         environment:
-#           - FORCE_FFI_YAJL=ext
-#           - CHEF_LICENSE=accept-no-persist
-#         shell: ["powershell", "-Command"]
-#
-# #########################################################################
-#   # EXTERNAL GEM TESTING
-# #########################################################################
-#
-# - label: "chef-zero gem :ruby: 3.0"
-#   commands:
-#     - /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:
-#     executor:
-#       docker:
-#         image: rubydistros/ubuntu-18.04:3.0
-#         environment:
-#           - PEDANT_OPTS=--skip-oc_id
-#           - CHEF_FS=true
-#
-# - label: "cheffish gem :ruby: 3.0"
-#   commands:
-#     - /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:3.0
-#
-# - label: "chefspec gem :ruby: 3.0"
-#   commands:
-#     - /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:
-#     executor:
-#       docker:
-#         image: rubydistros/ubuntu-18.04:3.0
-#
-# - label: "knife-windows gem :ruby: 3.0"
-#   commands:
-#     - /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:
-#     executor:
-#       docker:
-#         image: rubydistros/ubuntu-18.04:3.0
-#
-# - label: "berkshelf gem :ruby: 3.0"
-#   commands:
-#     - /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
-#     - bundle exec tasks/bin/run_external_test berkshelf/berkshelf master rake
-#   expeditor:
-#     executor:
-#       docker:
-#         image: rubydistros/ubuntu-18.04:3.0
-#
-# #########################################################################
-#   # START TEST KITCHEN ONLY
-# #########################################################################
-#
-# - label: "Kitchen: Amazon Linux 2"
-#   commands:
-#     - .expeditor/scripts/bk_linux_exec.sh
-#     - . /var/lib/buildkite-agent/.asdf/asdf.sh
-#     - cd kitchen-tests
-#     - bundle exec kitchen test end-to-end-amazonlinux-2
-#   artifact_paths:
-#     - $PWD/.kitchen/logs/kitchen.log
-#   env:
-#       KITCHEN_YAML: kitchen.yml
-#   expeditor:
-#     executor:
-#       linux:
-#         privileged: true
-#         single-use: true
-#
-# - label: "Kitchen: Ubuntu 18.04"
-#   commands:
-#     - .expeditor/scripts/bk_linux_exec.sh
-#     - . /var/lib/buildkite-agent/.asdf/asdf.sh
-#     - cd kitchen-tests
-#     - bundle exec kitchen test end-to-end-ubuntu-1804
-#   artifact_paths:
-#     - $PWD/.kitchen/logs/kitchen.log
-#   env:
-#       KITCHEN_YAML: kitchen.yml
-#   expeditor:
-#     executor:
-#       linux:
-#         privileged: true
-#         single-use: true
-#
-# - label: "Kitchen: Ubuntu 20.04"
-#   commands:
-#     - .expeditor/scripts/bk_linux_exec.sh
-#     - . /var/lib/buildkite-agent/.asdf/asdf.sh
-#     - cd kitchen-tests
-#     - bundle exec kitchen test end-to-end-ubuntu-2004
-#   artifact_paths:
-#     - $PWD/.kitchen/logs/kitchen.log
-#   env:
-#       KITCHEN_YAML: kitchen.yml
-#   expeditor:
-#     executor:
-#       linux:
-#         privileged: true
-#         single-use: true
-#
-# - label: "Kitchen: Ubuntu 21.04"
-#   commands:
-#     - .expeditor/scripts/bk_linux_exec.sh
-#     - . /var/lib/buildkite-agent/.asdf/asdf.sh
-#     - cd kitchen-tests
-#     - bundle exec kitchen test end-to-end-ubuntu-2104
-#   artifact_paths:
-#     - $PWD/.kitchen/logs/kitchen.log
-#   env:
-#       KITCHEN_YAML: kitchen.yml
-#   expeditor:
-#     executor:
-#       linux:
-#         privileged: true
-#         single-use: true
-#
-# - label: "Kitchen: Debian 9"
-#   commands:
-#     - .expeditor/scripts/bk_linux_exec.sh
-#     - . /var/lib/buildkite-agent/.asdf/asdf.sh
-#     - cd kitchen-tests
-#     - bundle exec kitchen test end-to-end-debian-9
-#   artifact_paths:
-#     - $PWD/.kitchen/logs/kitchen.log
-#   env:
-#       KITCHEN_YAML: kitchen.yml
-#   expeditor:
-#     executor:
-#       linux:
-#         privileged: true
-#         single-use: true
-#
-# - label: "Kitchen: Debian 10"
-#   commands:
-#     - .expeditor/scripts/bk_linux_exec.sh
-#     - . /var/lib/buildkite-agent/.asdf/asdf.sh
-#     - cd kitchen-tests
-#     - bundle exec kitchen test end-to-end-debian-10
-#   artifact_paths:
-#     - $PWD/.kitchen/logs/kitchen.log
-#   env:
-#       KITCHEN_YAML: kitchen.yml
-#   expeditor:
-#     executor:
-#       linux:
-#         privileged: true
-#         single-use: true
-#
-# - label: "Kitchen: Debian 11"
-#   commands:
-#     - .expeditor/scripts/bk_linux_exec.sh
-#     - . /var/lib/buildkite-agent/.asdf/asdf.sh
-#     - cd kitchen-tests
-#     - 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:
-#     - .expeditor/scripts/bk_linux_exec.sh
-#     - . /var/lib/buildkite-agent/.asdf/asdf.sh
-#     - cd kitchen-tests
-#     - bundle exec kitchen test end-to-end-centos-6
-#   artifact_paths:
-#     - $PWD/.kitchen/logs/kitchen.log
-#   env:
-#       KITCHEN_YAML: kitchen.yml
-#   expeditor:
-#     executor:
-#       linux:
-#         privileged: true
-#         single-use: true
-#
-# - label: "Kitchen: CentOS 7"
-#   commands:
-#     - .expeditor/scripts/bk_linux_exec.sh
-#     - . /var/lib/buildkite-agent/.asdf/asdf.sh
-#     - cd kitchen-tests
-#     - bundle exec kitchen test end-to-end-centos-7
-#   artifact_paths:
-#     - $PWD/.kitchen/logs/kitchen.log
-#   env:
-#       KITCHEN_YAML: kitchen.yml
-#   expeditor:
-#     executor:
-#       linux:
-#         privileged: true
-#         single-use: true
-#
-# - label: "Kitchen: CentOS 8"
-#   commands:
-#     - .expeditor/scripts/bk_linux_exec.sh
-#     - . /var/lib/buildkite-agent/.asdf/asdf.sh
-#     - cd kitchen-tests
-#     - bundle exec kitchen test end-to-end-centos-8
-#   artifact_paths:
-#     - $PWD/.kitchen/logs/kitchen.log
-#   env:
-#       KITCHEN_YAML: kitchen.yml
-#   expeditor:
-#     executor:
-#       linux:
-#         privileged: true
-#         single-use: true
-#
-# - label: "Kitchen: Oracle Linux 7"
-#   commands:
-#     - .expeditor/scripts/bk_linux_exec.sh
-#     - . /var/lib/buildkite-agent/.asdf/asdf.sh
-#     - cd kitchen-tests
-#     - bundle exec kitchen test end-to-end-oraclelinux-7
-#   artifact_paths:
-#     - $PWD/.kitchen/logs/kitchen.log
-#   env:
-#       KITCHEN_YAML: kitchen.yml
-#   expeditor:
-#     executor:
-#       linux:
-#         privileged: true
-#         single-use: true
-#
-# - label: "Kitchen: Oracle Linux 8"
-#   commands:
-#     - .expeditor/scripts/bk_linux_exec.sh
-#     - . /var/lib/buildkite-agent/.asdf/asdf.sh
-#     - cd kitchen-tests
-#     - bundle exec kitchen test end-to-end-oraclelinux-8
-#   artifact_paths:
-#     - $PWD/.kitchen/logs/kitchen.log
-#   env:
-#       KITCHEN_YAML: kitchen.yml
-#   expeditor:
-#     executor:
-#       linux:
-#         privileged: true
-#         single-use: true
-#
-# - label: "Kitchen: Fedora latest"
-#   commands:
-#     - .expeditor/scripts/bk_linux_exec.sh
-#     - . /var/lib/buildkite-agent/.asdf/asdf.sh
-#     - cd kitchen-tests
-#     - bundle exec kitchen test end-to-end-fedora-latest
-#   artifact_paths:
-#     - $PWD/.kitchen/logs/kitchen.log
-#   env:
-#       KITCHEN_YAML: kitchen.yml
-#   expeditor:
-#     executor:
-#       linux:
-#         privileged: true
-#         single-use: true
-#
-# - label: "Kitchen: openSUSE Leap: 15"
-#   commands:
-#     - .expeditor/scripts/bk_linux_exec.sh
-#     - . /var/lib/buildkite-agent/.asdf/asdf.sh
-#     - cd kitchen-tests
-#     - bundle exec kitchen test end-to-end-opensuse-leap-15
-#   artifact_paths:
-#     - $PWD/.kitchen/logs/kitchen.log
-#   env:
-#       KITCHEN_YAML: kitchen.yml
-#   expeditor:
-#     executor:
-#       linux:
-#         privileged: true
-#         single-use: true
-#
-# - label: ":habicat: Linux plan"
-#   commands:
-#     - sudo ./.expeditor/scripts/install-hab.sh 'x86_64-linux'
-#     - sudo ./.expeditor/scripts/verify-plan.sh
-#   timeout_in_minutes: 60
-#   expeditor:
-#     executor:
-#       linux:
-#         privileged: true
-#         single-use: true
-#
-# - label: ":habicat: Windows plan"
-#   commands:
-#     - ./.expeditor/scripts/verify-plan.ps1
-#   timeout_in_minutes: 60
-#   expeditor:
-#     executor:
-#       windows:
-#         privileged: true
-#         single-use: true
-#         shell: ["powershell", "-Command"]
+- label: "Integration openSUSE 15 :ruby: 3.0"
+  commands:
+    - /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
+  expeditor:
+    executor:
+      docker:
+        image: rubydistros/opensuse-15:3.0
+        privileged: true
+
+- label: "Functional openSUSE 15 :ruby: 3.0"
+  commands:
+    - /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
+  expeditor:
+    executor:
+      docker:
+        image: rubydistros/opensuse-15:3.0
+        privileged: true
+
+- label: "Unit openSUSE 15 :ruby: 3.0"
+  commands:
+    - /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
+    - bundle exec rake component_specs
+  expeditor:
+    executor:
+      docker:
+        image: rubydistros/opensuse-15:3.0
+
+- label: "Integration Fedora :ruby: 3.0"
+  commands:
+    - /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:
+    executor:
+      docker:
+        image: rubydistros/fedora-latest:3.0
+        privileged: true
+
+- label: "Functional Fedora :ruby: 3.0"
+  commands:
+    - /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:
+    executor:
+      docker:
+        image: rubydistros/fedora-latest:3.0
+        privileged: true
+        environment:
+          - FORCE_FFI_YAJL=ext
+          - CHEF_LICENSE=accept-no-persist
+
+- label: "Unit Fedora :ruby: 3.0"
+  commands:
+    - /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
+  expeditor:
+    executor:
+      docker:
+        image: rubydistros/fedora-latest:3.0
+
+- label: "Functional Windows :ruby: 3.0"
+  commands:
+    - .expeditor/scripts/bk_win_functional.ps1
+  expeditor:
+    executor:
+      windows:
+        privileged: true
+        single-use: true
+        shell: ["powershell", "-Command"]
+
+- label: "Integration Windows :ruby: 3.0"
+  commands:
+    - /workdir/.expeditor/scripts/bk_win_integration.ps1
+  expeditor:
+    executor:
+      docker:
+        host_os: windows
+        image: rubydistros/windows-2019:3.0
+        environment:
+          - FORCE_FFI_YAJL=ext
+          - CHEF_LICENSE=accept-no-persist
+        shell: ["powershell", "-Command"]
+
+- label: "Unit Windows :ruby: 3.0"
+  commands:
+    - /workdir/.expeditor/scripts/bk_win_unit.ps1
+  expeditor:
+    executor:
+      docker:
+        host_os: windows
+        image: rubydistros/windows-2019:3.0
+        environment:
+          - FORCE_FFI_YAJL=ext
+          - CHEF_LICENSE=accept-no-persist
+        shell: ["powershell", "-Command"]
+
+#########################################################################
+  # EXTERNAL GEM TESTING
+#########################################################################
+
+- label: "chef-zero gem :ruby: 3.0"
+  commands:
+    - /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:
+    executor:
+      docker:
+        image: rubydistros/ubuntu-18.04:3.0
+        environment:
+          - PEDANT_OPTS=--skip-oc_id
+          - CHEF_FS=true
+
+- label: "cheffish gem :ruby: 3.0"
+  commands:
+    - /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:3.0
+
+- label: "chefspec gem :ruby: 3.0"
+  commands:
+    - /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:
+    executor:
+      docker:
+        image: rubydistros/ubuntu-18.04:3.0
+
+- label: "knife-windows gem :ruby: 3.0"
+  commands:
+    - /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:
+    executor:
+      docker:
+        image: rubydistros/ubuntu-18.04:3.0
+
+- label: "berkshelf gem :ruby: 3.0"
+  commands:
+    - /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
+    - bundle exec tasks/bin/run_external_test berkshelf/berkshelf master rake
+  expeditor:
+    executor:
+      docker:
+        image: rubydistros/ubuntu-18.04:3.0
+
+#########################################################################
+  # START TEST KITCHEN ONLY
+#########################################################################
+
+- label: "Kitchen: Amazon Linux 2"
+  commands:
+    - .expeditor/scripts/bk_linux_exec.sh
+    - . /var/lib/buildkite-agent/.asdf/asdf.sh
+    - cd kitchen-tests
+    - bundle exec kitchen test end-to-end-amazonlinux-2
+  artifact_paths:
+    - $PWD/.kitchen/logs/kitchen.log
+  env:
+      KITCHEN_YAML: kitchen.yml
+  expeditor:
+    executor:
+      linux:
+        privileged: true
+        single-use: true
+
+- label: "Kitchen: Ubuntu 18.04"
+  commands:
+    - .expeditor/scripts/bk_linux_exec.sh
+    - . /var/lib/buildkite-agent/.asdf/asdf.sh
+    - cd kitchen-tests
+    - bundle exec kitchen test end-to-end-ubuntu-1804
+  artifact_paths:
+    - $PWD/.kitchen/logs/kitchen.log
+  env:
+      KITCHEN_YAML: kitchen.yml
+  expeditor:
+    executor:
+      linux:
+        privileged: true
+        single-use: true
+
+- label: "Kitchen: Ubuntu 20.04"
+  commands:
+    - .expeditor/scripts/bk_linux_exec.sh
+    - . /var/lib/buildkite-agent/.asdf/asdf.sh
+    - cd kitchen-tests
+    - bundle exec kitchen test end-to-end-ubuntu-2004
+  artifact_paths:
+    - $PWD/.kitchen/logs/kitchen.log
+  env:
+      KITCHEN_YAML: kitchen.yml
+  expeditor:
+    executor:
+      linux:
+        privileged: true
+        single-use: true
+
+- label: "Kitchen: Ubuntu 21.04"
+  commands:
+    - .expeditor/scripts/bk_linux_exec.sh
+    - . /var/lib/buildkite-agent/.asdf/asdf.sh
+    - cd kitchen-tests
+    - bundle exec kitchen test end-to-end-ubuntu-2104
+  artifact_paths:
+    - $PWD/.kitchen/logs/kitchen.log
+  env:
+      KITCHEN_YAML: kitchen.yml
+  expeditor:
+    executor:
+      linux:
+        privileged: true
+        single-use: true
+
+- label: "Kitchen: Debian 9"
+  commands:
+    - .expeditor/scripts/bk_linux_exec.sh
+    - . /var/lib/buildkite-agent/.asdf/asdf.sh
+    - cd kitchen-tests
+    - bundle exec kitchen test end-to-end-debian-9
+  artifact_paths:
+    - $PWD/.kitchen/logs/kitchen.log
+  env:
+      KITCHEN_YAML: kitchen.yml
+  expeditor:
+    executor:
+      linux:
+        privileged: true
+        single-use: true
+
+- label: "Kitchen: Debian 10"
+  commands:
+    - .expeditor/scripts/bk_linux_exec.sh
+    - . /var/lib/buildkite-agent/.asdf/asdf.sh
+    - cd kitchen-tests
+    - bundle exec kitchen test end-to-end-debian-10
+  artifact_paths:
+    - $PWD/.kitchen/logs/kitchen.log
+  env:
+      KITCHEN_YAML: kitchen.yml
+  expeditor:
+    executor:
+      linux:
+        privileged: true
+        single-use: true
+
+- label: "Kitchen: Debian 11"
+  commands:
+    - .expeditor/scripts/bk_linux_exec.sh
+    - . /var/lib/buildkite-agent/.asdf/asdf.sh
+    - cd kitchen-tests
+    - 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:
+    - .expeditor/scripts/bk_linux_exec.sh
+    - . /var/lib/buildkite-agent/.asdf/asdf.sh
+    - cd kitchen-tests
+    - bundle exec kitchen test end-to-end-centos-6
+  artifact_paths:
+    - $PWD/.kitchen/logs/kitchen.log
+  env:
+      KITCHEN_YAML: kitchen.yml
+  expeditor:
+    executor:
+      linux:
+        privileged: true
+        single-use: true
+
+- label: "Kitchen: CentOS 7"
+  commands:
+    - .expeditor/scripts/bk_linux_exec.sh
+    - . /var/lib/buildkite-agent/.asdf/asdf.sh
+    - cd kitchen-tests
+    - bundle exec kitchen test end-to-end-centos-7
+  artifact_paths:
+    - $PWD/.kitchen/logs/kitchen.log
+  env:
+      KITCHEN_YAML: kitchen.yml
+  expeditor:
+    executor:
+      linux:
+        privileged: true
+        single-use: true
+
+- label: "Kitchen: CentOS 8"
+  commands:
+    - .expeditor/scripts/bk_linux_exec.sh
+    - . /var/lib/buildkite-agent/.asdf/asdf.sh
+    - cd kitchen-tests
+    - bundle exec kitchen test end-to-end-centos-8
+  artifact_paths:
+    - $PWD/.kitchen/logs/kitchen.log
+  env:
+      KITCHEN_YAML: kitchen.yml
+  expeditor:
+    executor:
+      linux:
+        privileged: true
+        single-use: true
+
+- label: "Kitchen: Oracle Linux 7"
+  commands:
+    - .expeditor/scripts/bk_linux_exec.sh
+    - . /var/lib/buildkite-agent/.asdf/asdf.sh
+    - cd kitchen-tests
+    - bundle exec kitchen test end-to-end-oraclelinux-7
+  artifact_paths:
+    - $PWD/.kitchen/logs/kitchen.log
+  env:
+      KITCHEN_YAML: kitchen.yml
+  expeditor:
+    executor:
+      linux:
+        privileged: true
+        single-use: true
+
+- label: "Kitchen: Oracle Linux 8"
+  commands:
+    - .expeditor/scripts/bk_linux_exec.sh
+    - . /var/lib/buildkite-agent/.asdf/asdf.sh
+    - cd kitchen-tests
+    - bundle exec kitchen test end-to-end-oraclelinux-8
+  artifact_paths:
+    - $PWD/.kitchen/logs/kitchen.log
+  env:
+      KITCHEN_YAML: kitchen.yml
+  expeditor:
+    executor:
+      linux:
+        privileged: true
+        single-use: true
+
+- label: "Kitchen: Fedora latest"
+  commands:
+    - .expeditor/scripts/bk_linux_exec.sh
+    - . /var/lib/buildkite-agent/.asdf/asdf.sh
+    - cd kitchen-tests
+    - bundle exec kitchen test end-to-end-fedora-latest
+  artifact_paths:
+    - $PWD/.kitchen/logs/kitchen.log
+  env:
+      KITCHEN_YAML: kitchen.yml
+  expeditor:
+    executor:
+      linux:
+        privileged: true
+        single-use: true
+
+- label: "Kitchen: openSUSE Leap: 15"
+  commands:
+    - .expeditor/scripts/bk_linux_exec.sh
+    - . /var/lib/buildkite-agent/.asdf/asdf.sh
+    - cd kitchen-tests
+    - bundle exec kitchen test end-to-end-opensuse-leap-15
+  artifact_paths:
+    - $PWD/.kitchen/logs/kitchen.log
+  env:
+      KITCHEN_YAML: kitchen.yml
+  expeditor:
+    executor:
+      linux:
+        privileged: true
+        single-use: true
+
+- label: ":habicat: Linux plan"
+  commands:
+    - sudo ./.expeditor/scripts/install-hab.sh 'x86_64-linux'
+    - sudo ./.expeditor/scripts/verify-plan.sh
+  timeout_in_minutes: 60
+  expeditor:
+    executor:
+      linux:
+        privileged: true
+        single-use: true
+
+- label: ":habicat: Windows plan"
+  commands:
+    - ./.expeditor/scripts/verify-plan.ps1
+  timeout_in_minutes: 60
+  expeditor:
+    executor:
+      windows:
+        privileged: true
+        single-use: true
+        shell: ["powershell", "-Command"]
diff --git a/tasks/rspec.rb b/tasks/rspec.rb
index a6e99c22a8..e437f30227 100644
--- a/tasks/rspec.rb
+++ b/tasks/rspec.rb
@@ -25,7 +25,7 @@ begin
 
   desc "Run specs for Chef's Gem Components"
   task :component_specs do
-    %w{chef-utils chef-config}.each do |gem|
+    %w{chef-utils chef-config knife}.each do |gem|
       Dir.chdir(gem) do
         puts "--- Running #{gem} specs"
         Bundler.with_unbundled_env do
@@ -44,9 +44,7 @@ begin
   RSpec::Core::RakeTask.new(:spec) do |t|
     t.verbose = false
     t.rspec_opts = %w{--profile}
-    t.pattern = FileList["spec/**/*_spec.rb"].reject do |path|
-      path =~ /knife.*/
-    end
+    t.pattern = FileList["spec/**/*_spec.rb"]
   end
 
   namespace :spec do
@@ -55,9 +53,6 @@ begin
       t.verbose = false
       t.rspec_opts = %w{--profile}
       t.pattern = FileList["spec/**/*_spec.rb"]
-      t.pattern = FileList["spec/**/*_spec.rb"].reject do |path|
-        path =~ /knife.*/
-      end
     end
 
     desc "Print Specdoc for all specs"
@@ -80,9 +75,7 @@ begin
       RSpec::Core::RakeTask.new(sub) do |t|
         t.verbose = false
         t.rspec_opts = %w{--profile}
-        t.pattern = FileList["spec/#{sub}/**/*_spec.rb"].reject do |path|
-          path =~ /knife.*/
-        end
+        t.pattern = FileList["spec/#{sub}/**/*_spec.rb"]
       end
     end
   end