Merge pull request #8641 from chef/bk

Update Buildkite config with Ubuntu/CentOS/openSUSE containers

6 files changed, 299 insertions, 410 deletions

diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index a850643fb0..2cb076e10c 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -10,59 +10,147 @@ steps:
   # Tests Ruby 2.6
 #########################################################################
 
-- label: "Integration Specs :ruby: 2.6"
+- label: "Integration Specs Ubuntu :ruby: 2.6"
   commands:
-    - /workdir/scripts/bk_tests/bk_install.sh
+    - /workdir/scripts/bk_tests/bk_container_prep.sh
     - cd /workdir; bundle install --jobs=3 --retry=3 --without omnibus_package docgen
     - bundle exec rake spec:integration
   expeditor:
     executor:
       docker:
-        image: ruby:2.6-stretch
+        image: rubydistros/ubuntu-18.04
         privileged: true
         environment:
           - FORCE_FFI_YAJL=ext
           - CHEF_LICENSE=accept-no-persist
           - BUNDLE_GEMFILE=/workdir/Gemfile
 
-- label: "Functional Specs :ruby: 2.6"
+- label: "Functional Specs Ubuntu :ruby: 2.6"
   commands:
-    - /workdir/scripts/bk_tests/bk_install.sh
+    - /workdir/scripts/bk_tests/bk_container_prep.sh
     - apt-get install -y cron locales # needed for functional tests to pass
     - cd /workdir; bundle install --jobs=3 --retry=3 --without omnibus_package docgen ruby_prof
     - bundle exec rake spec:functional
   expeditor:
     executor:
       docker:
-        image: ruby:2.6-stretch
+        image: rubydistros/ubuntu-18.04
         privileged: true
         environment:
           - FORCE_FFI_YAJL=ext
           - CHEF_LICENSE=accept-no-persist
 
-- label: "Unit Specs :ruby: 2.6"
+- label: "Unit Specs Ubuntu :ruby: 2.6"
   commands:
-    - /workdir/scripts/bk_tests/bk_install.sh
+    - /workdir/scripts/bk_tests/bk_container_prep.sh
     - bundle install --jobs=3 --retry=3 --without omnibus_package docgen ruby_prof
     - bundle exec rake spec:unit
     - bundle exec rake component_specs
   expeditor:
     executor:
       docker:
-        image: ruby:2.6-stretch
+        image: rubydistros/ubuntu-18.04
+        environment:
+          - FORCE_FFI_YAJL=ext
+          - CHEF_LICENSE=accept-no-persist
+
+- label: "Integration Specs CentOS :ruby: 2.6"
+  commands:
+    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - cd /workdir; bundle install --jobs=3 --retry=3 --without omnibus_package docgen
+    - bundle exec rake spec:integration
+  expeditor:
+    executor:
+      docker:
+        image: rubydistros/centos-7
+        privileged: true
+        environment:
+          - FORCE_FFI_YAJL=ext
+          - CHEF_LICENSE=accept-no-persist
+          - BUNDLE_GEMFILE=/workdir/Gemfile
+
+- label: "Functional Specs CentOS :ruby: 2.6"
+  commands:
+    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - yum install -y crontabs e2fsprogs util-linux
+    - cd /workdir; bundle install --jobs=3 --retry=3 --without omnibus_package docgen ruby_prof
+    - bundle exec rake spec:functional
+  expeditor:
+    executor:
+      docker:
+        image: rubydistros/centos-7
+        privileged: true
+        environment:
+          - FORCE_FFI_YAJL=ext
+          - CHEF_LICENSE=accept-no-persist
+
+- label: "Unit Specs CentOS :ruby: 2.6"
+  commands:
+    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - bundle install --jobs=3 --retry=3 --without omnibus_package docgen ruby_prof
+    - bundle exec rake spec:unit
+    - bundle exec rake component_specs
+  expeditor:
+    executor:
+      docker:
+        image: rubydistros/centos-7
+        environment:
+          - FORCE_FFI_YAJL=ext
+          - CHEF_LICENSE=accept-no-persist
+
+- label: "Integration Specs openSUSE :ruby: 2.6"
+  commands:
+    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - cd /workdir; bundle install --jobs=3 --retry=3 --without omnibus_package docgen
+    - bundle exec rake spec:integration
+  expeditor:
+    executor:
+      docker:
+        image: rubydistros/opensuse-15
+        privileged: true
+        environment:
+          - FORCE_FFI_YAJL=ext
+          - CHEF_LICENSE=accept-no-persist
+          - BUNDLE_GEMFILE=/workdir/Gemfile
+
+- label: "Functional Specs openSUSE :ruby: 2.6"
+  commands:
+    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - zypper install -y cronie
+    - cd /workdir; bundle install --jobs=3 --retry=3 --without omnibus_package docgen ruby_prof
+    - bundle exec rake spec:functional
+  expeditor:
+    executor:
+      docker:
+        image: rubydistros/opensuse-15
+        privileged: true
+        environment:
+          - FORCE_FFI_YAJL=ext
+          - CHEF_LICENSE=accept-no-persist
+
+- label: "Unit Specs openSUSE :ruby: 2.6"
+  commands:
+    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - bundle install --jobs=3 --retry=3 --without omnibus_package docgen ruby_prof
+    - bundle exec rake spec:unit
+    - bundle exec rake component_specs
+  expeditor:
+    executor:
+      docker:
+        image: rubydistros/opensuse-15
         environment:
           - FORCE_FFI_YAJL=ext
           - CHEF_LICENSE=accept-no-persist
 
 - label: "Chefstyle :ruby: 2.6"
   commands:
-    - /workdir/scripts/bk_tests/bk_install.sh
+    - /workdir/scripts/bk_tests/bk_container_prep.sh
     - bundle install --jobs=3 --retry=3 --without omnibus_package docgen ruby_prof
     - bundle exec rake style
   expeditor:
     executor:
       docker:
-        image: ruby:2.6-stretch
+        image: rubydistros/ubuntu-18.04
 
 #########################################################################
   # Tests Ruby 2.5
@@ -70,7 +158,7 @@ steps:
 
 - label: "Integration Specs :ruby: 2.5"
   commands:
-    - /workdir/scripts/bk_tests/bk_install.sh
+    - /workdir/scripts/bk_tests/bk_container_prep.sh
     - bundle install --jobs=3 --retry=3 --without omnibus_package docgen
     - bundle exec rake spec:integration
   expeditor:
@@ -85,7 +173,7 @@ steps:
 #
 - label: "Functional Specs :ruby: 2.5"
   commands:
-    - /workdir/scripts/bk_tests/bk_install.sh
+    - /workdir/scripts/bk_tests/bk_container_prep.sh
     - apt-get install -y cron locales # needed for functional tests to pass
     - bundle install --jobs=3 --retry=3 --without omnibus_package docgen
     - bundle exec rake spec:functional
@@ -101,7 +189,7 @@ steps:
 
 - label: "Unit Specs :ruby: 2.5"
   commands:
-    - /workdir/scripts/bk_tests/bk_install.sh
+    - /workdir/scripts/bk_tests/bk_container_prep.sh
     - bundle install --jobs=3 --retry=3 --without omnibus_package docgen
     - bundle exec rake spec:unit
     - bundle exec rake component_specs
@@ -120,254 +208,223 @@ steps:
 
 - label: "Test chef-sugar gem :ruby: 2.6"
   commands:
-    - /workdir/scripts/bk_tests/bk_install.sh
+    - /workdir/scripts/bk_tests/bk_container_prep.sh
     - bundle install --jobs=3 --retry=3 --without omnibus_package docgen
     - bundle exec tasks/bin/run_external_test sethvargo/chef-sugar master rake
   expeditor:
     executor:
       docker:
-        image: ruby:2.6-stretch
+        image: rubydistros/ubuntu-18.04
 
 - label: "Test chef-zero gem :ruby: 2.6"
   commands:
-    - /workdir/scripts/bk_tests/bk_install.sh
+    - /workdir/scripts/bk_tests/bk_container_prep.sh
     - bundle install --jobs=3 --retry=3 --without omnibus_package docgen
     - bundle exec tasks/bin/run_external_test chef/chef-zero master rake pedant
   expeditor:
     executor:
       docker:
-        image: ruby:2.6-stretch
+        image: rubydistros/ubuntu-18.04
         environment:
           - PEDANT_OPTS=--skip-oc_id
           - CHEF_FS=true
 
 - label: "Test cheffish gem :ruby: 2.6"
   commands:
-    - /workdir/scripts/bk_tests/bk_install.sh
+    - /workdir/scripts/bk_tests/bk_container_prep.sh
     - bundle install --jobs=3 --retry=3 --without omnibus_package docgen
     - bundle exec tasks/bin/run_external_test chef/cheffish master rake spec
   expeditor:
     executor:
       docker:
-        image: ruby:2.6-stretch
+        image: rubydistros/ubuntu-18.04
 
 - label: "Test chefspec gem :ruby: 2.6"
   commands:
-    - /workdir/scripts/bk_tests/bk_install.sh
+    - /workdir/scripts/bk_tests/bk_container_prep.sh
     - bundle install --jobs=3 --retry=3 --without omnibus_package docgen
     - bundle exec tasks/bin/run_external_test chefspec/chefspec master rake
   expeditor:
     executor:
       docker:
-        image: ruby:2.6-stretch
+        image: rubydistros/ubuntu-18.04
 
 - label: "Test knife-windows gem :ruby: 2.6"
   commands:
-    - /workdir/scripts/bk_tests/bk_install.sh
+    - /workdir/scripts/bk_tests/bk_container_prep.sh
     - bundle install --jobs=3 --retry=3 --without omnibus_package docgen
     - bundle exec tasks/bin/run_external_test chef/knife-windows master rake unit_spec
   expeditor:
     executor:
       docker:
-        image: ruby:2.6-stretch
+        image: rubydistros/ubuntu-18.04
 
 #########################################################################
   # START TEST KITCHEN ONLY
 #########################################################################
 
-- label: "Kitchen Tests :amazon: 2"
-  commands:
-    - scripts/bk_tests/bk_linux_exec.sh
-    - cd kitchen-tests
-    - ~/.asdf/shims/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 Tests :amazon: 201X"
-  commands:
-    - scripts/bk_tests/bk_linux_exec.sh
-    - cd kitchen-tests
-    - ~/.asdf/shims/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 Tests Ubuntu: 16.04"
-  commands:
-    - scripts/bk_tests/bk_linux_exec.sh
-    - cd kitchen-tests
-    - ~/.asdf/shims/bundle exec kitchen test end-to-end-ubuntu-1604
-  artifact_paths:
-    - $PWD/.kitchen/logs/kitchen.log
-  env:
-      UBUNTU: "16.04"
-      KITCHEN_YAML: kitchen.yml
-  expeditor:
-    executor:
-      linux:
-        privileged: true
-        single-use: true
-
-- label: "Kitchen Tests Ubuntu: 18.04"
-  commands:
-    - scripts/bk_tests/bk_linux_exec.sh
-    - cd kitchen-tests
-    - ~/.asdf/shims/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 Tests Debian: 8"
-  commands:
-    - scripts/bk_tests/bk_linux_exec.sh
-    - cd kitchen-tests
-    - ~/.asdf/shims/bundle exec kitchen test end-to-end-debian-8
-  artifact_paths:
-    - $PWD/.kitchen/logs/kitchen.log
-  env:
-      KITCHEN_YAML: kitchen.yml
-  expeditor:
-    executor:
-      linux:
-        privileged: true
-        single-use: true
-
-- label: "Kitchen Tests Debian: 9"
-  commands:
-    - scripts/bk_tests/bk_linux_exec.sh
-    - cd kitchen-tests
-    - ~/.asdf/shims/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 Tests Debian: 10"
-  commands:
-    - scripts/bk_tests/bk_linux_exec.sh
-    - cd kitchen-tests
-    - ~/.asdf/shims/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 Tests CentOS: 6"
-  commands:
-    - scripts/bk_tests/bk_linux_exec.sh
-    - cd kitchen-tests
-    - ~/.asdf/shims/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 Tests CentOS: 7"
-  commands:
-    - scripts/bk_tests/bk_linux_exec.sh
-    - cd kitchen-tests
-    - ~/.asdf/shims/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 Tests Fedora: latest"
-  commands:
-    - scripts/bk_tests/bk_linux_exec.sh
-    - cd kitchen-tests
-    - ~/.asdf/shims/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 Tests openSUSE Leap: 42"
-  commands:
-    - scripts/bk_tests/bk_linux_exec.sh
-    - cd kitchen-tests
-    - ~/.asdf/shims/bundle exec kitchen test end-to-end-opensuse-leap
-  artifact_paths:
-    - $PWD/.kitchen/logs/kitchen.log
-  env:
-      KITCHEN_YAML: kitchen.yml
-  expeditor:
-    executor:
-      linux:
-        privileged: true
-        single-use: true
-
-- label: "rspec on CentOS 7 :ruby: 2.5"
-  commands:
-    - scripts/bk_tests/bk_linux_exec.sh
-    - cd kitchen-tests
-    - ~/.asdf/shims/bundle exec kitchen test rspec-centos-7
-  artifact_paths:
-    - $PWD/.kitchen/logs/kitchen.log
-  env:
-      KITCHEN_YAML: kitchen.yml
-  expeditor:
-    executor:
-      linux:
-        image: centos/ruby-25-centos7
-        privileged: true
-        single-use: true
-
-- label: "rspec on openSUSE Leap 42 :ruby: 2.5"
-  commands:
-    - scripts/bk_tests/bk_linux_exec.sh
-    - cd kitchen-tests
-    - ~/.asdf/shims/bundle exec kitchen test rspec-opensuse-leap\
-  artifact_paths:
-  - $PWD/.kitchen/logs/kitchen.log
-  env:
-      KITCHEN_YAML: kitchen.yml
-  expeditor:
-    executor:
-      linux:
-        privileged: true
-        single-use: true
+# - label: "Kitchen Tests :amazon: 2"
+#   commands:
+#     - scripts/bk_tests/bk_linux_exec.sh
+#     - cd kitchen-tests
+#     - ~/.asdf/shims/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 Tests :amazon: 201X"
+#   commands:
+#     - scripts/bk_tests/bk_linux_exec.sh
+#     - cd kitchen-tests
+#     - ~/.asdf/shims/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 Tests Ubuntu: 16.04"
+#   commands:
+#     - scripts/bk_tests/bk_linux_exec.sh
+#     - cd kitchen-tests
+#     - ~/.asdf/shims/bundle exec kitchen test end-to-end-ubuntu-1604
+#   artifact_paths:
+#     - $PWD/.kitchen/logs/kitchen.log
+#   env:
+#       UBUNTU: "16.04"
+#       KITCHEN_YAML: kitchen.yml
+#   expeditor:
+#     executor:
+#       linux:
+#         privileged: true
+#         single-use: true
+#
+# - label: "Kitchen Tests Ubuntu: 18.04"
+#   commands:
+#     - scripts/bk_tests/bk_linux_exec.sh
+#     - cd kitchen-tests
+#     - ~/.asdf/shims/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 Tests Debian: 8"
+#   commands:
+#     - scripts/bk_tests/bk_linux_exec.sh
+#     - cd kitchen-tests
+#     - ~/.asdf/shims/bundle exec kitchen test end-to-end-debian-8
+#   artifact_paths:
+#     - $PWD/.kitchen/logs/kitchen.log
+#   env:
+#       KITCHEN_YAML: kitchen.yml
+#   expeditor:
+#     executor:
+#       linux:
+#         privileged: true
+#         single-use: true
+#
+# - label: "Kitchen Tests Debian: 9"
+#   commands:
+#     - scripts/bk_tests/bk_linux_exec.sh
+#     - cd kitchen-tests
+#     - ~/.asdf/shims/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 Tests Debian: 10"
+#   commands:
+#     - scripts/bk_tests/bk_linux_exec.sh
+#     - cd kitchen-tests
+#     - ~/.asdf/shims/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 Tests CentOS: 6"
+#   commands:
+#     - scripts/bk_tests/bk_linux_exec.sh
+#     - cd kitchen-tests
+#     - ~/.asdf/shims/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 Tests CentOS: 7"
+#   commands:
+#     - scripts/bk_tests/bk_linux_exec.sh
+#     - cd kitchen-tests
+#     - ~/.asdf/shims/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 Tests Fedora: latest"
+#   commands:
+#     - scripts/bk_tests/bk_linux_exec.sh
+#     - cd kitchen-tests
+#     - ~/.asdf/shims/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 Tests openSUSE Leap: 42"
+#   commands:
+#     - scripts/bk_tests/bk_linux_exec.sh
+#     - cd kitchen-tests
+#     - ~/.asdf/shims/bundle exec kitchen test end-to-end-opensuse-leap
+#   artifact_paths:
+#     - $PWD/.kitchen/logs/kitchen.log
+#   env:
+#       KITCHEN_YAML: kitchen.yml
+#   expeditor:
+#     executor:
+#       linux:
+#         privileged: true
+#         single-use: true
diff --git a/.travis.yml b/.travis.yml
index 24b24082d6..6904a1da75 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,79 +34,6 @@ env:
 
 matrix:
   include:
-  - env:
-      INTEGRATION_SPECS_25: 1
-    rvm: 2.5.5
-    sudo: true
-    script: sudo -E $(which bundle) exec rake spec:integration;
-    bundler_args: --without docgen integration omnibus_package --frozen
-  - env:
-      INTEGRATION_SPECS_26: 1
-    rvm: 2.6.3
-    sudo: true
-    script: sudo -E $(which bundle) exec rake spec:integration;
-    bundler_args: --without docgen integration omnibus_package --frozen
-  - env:
-      FUNCTIONAL_SPECS_25: 1
-    rvm: 2.5.5
-    sudo: true
-    # the travis apt proxy screws with our functional testing something fierce
-    script: sudo rm -f /etc/apt/apt.conf.d/99-travis-apt-proxy; sudo -E $(which bundle) exec rake spec:functional;
-    bundler_args: --without docgen integration omnibus_package --frozen
-  - env:
-      FUNCTIONAL_SPECS_26: 1
-    rvm: 2.6.3
-    sudo: true
-    script: sudo rm -f /etc/apt/apt.conf.d/99-travis-apt-proxy; sudo -E $(which bundle) exec rake spec:functional;
-    bundler_args: --without docgen integration omnibus_package --frozen
-  - env:
-      UNIT_SPECS_25: 1
-    rvm: 2.5.5
-    sudo: true
-    script:
-      - sudo -E $(which bundle) exec rake spec:unit;
-      - sudo -E $(which bundle) exec rake component_specs
-    bundler_args: --without docgen integration omnibus_package --frozen
-  - env:
-      UNIT_SPECS_26: 1
-    rvm: 2.6.3
-    sudo: true
-    script:
-      - sudo -E $(which bundle) exec rake spec:unit;
-      - sudo -E $(which bundle) exec rake component_specs
-    bundler_args: --without docgen integration omnibus_package --frozen
-  - env:
-      CHEFSTYLE: 1
-    rvm: 2.6.3
-    script: bundle exec rake style
-    # also remove integration / external tests
-    bundler_args: --without docgen integration omnibus_package --frozen
-  #
-  # External tests
-  #
-  - env:
-      TEST_GEM: sethvargo/chef-sugar
-    script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake
-    rvm: 2.6.3
-  - env:
-      - PEDANT_OPTS=--skip-oc_id
-      - TEST_GEM=chef/chef-zero
-      - CHEF_FS=true
-    script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake pedant
-    rvm: 2.6.3
-  - env:
-      TEST_GEM: chef/cheffish
-    script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec
-    rvm: 2.6.3
-  - env:
-      TEST_GEM: chefspec/chefspec
-    script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake
-    rvm: 2.6.3
-  - env:
-      TEST_GEM: chef/knife-windows
-    script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake unit_spec
-    rvm: 2.6.3
-  ### START TEST KITCHEN ONLY ###
   - rvm: 2.5.5
     services: docker
     gemfile: kitchen-tests/Gemfile
@@ -301,76 +228,6 @@ matrix:
       - cat /tmp/out.txt
       - sudo cat /var/log/squid3/cache.log
       - sudo cat /var/log/squid3/access.log
-  # Use test-kitchen to launch a centos docker container to run the full rspec tests against.  This catches
-  # errors in travis, before PRs are merged, hopefully before they become errors in jenkins.
-  - rvm: 2.5.5
-    services: docker
-    sudo: required
-    gemfile: kitchen-tests/Gemfile
-    before_install:
-      - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
-      - gem install bundler -v $(grep :bundler omnibus_overrides.rb | cut -d'"' -f2)
-    before_script:
-      - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
-      - cd kitchen-tests
-    script:
-      - bundle exec kitchen test rspec-centos-7
-    after_failure:
-      - cat .kitchen/logs/kitchen.log
-    env:
-      - RSPEC_CENTOS=7
-      - KITCHEN_YAML=kitchen.yml
-  - rvm: 2.5.5
-    services: docker
-    sudo: required
-    gemfile: kitchen-tests/Gemfile
-    before_install:
-      - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
-      - gem install bundler -v $(grep :bundler omnibus_overrides.rb | cut -d'"' -f2)
-    before_script:
-      - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
-      - cd kitchen-tests
-    script:
-      - bundle exec kitchen test rspec-opensuse-leap
-    after_failure:
-      - cat .kitchen/logs/kitchen.log
-    env:
-     - RSPEC_OPENSUSELEAP=42
-     - KITCHEN_YAML=kitchen.yml
-  allow_failures:
-    - rvm: 2.5.5
-      services: docker
-      sudo: required
-      gemfile: kitchen-tests/Gemfile
-      before_install:
-        - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
-        - gem install bundler -v $(grep :bundler omnibus_overrides.rb | cut -d'"' -f2)
-      before_script:
-        - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
-        - cd kitchen-tests
-      script:
-        - bundle exec kitchen test rspec-opensuse-leap
-      after_failure:
-        - cat .kitchen/logs/kitchen.log
-      env:
-       - RSPEC_OPENSUSELEAP=42
-       - KITCHEN_YAML=kitchen.yml
-    - rvm: 2.5.5
-      services: docker
-      gemfile: kitchen-tests/Gemfile
-      before_install:
-        - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
-        - gem install bundler -v $(grep :bundler omnibus_overrides.rb | cut -d'"' -f2)
-      before_script:
-        - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
-        - cd kitchen-tests
-      script:
-        - bundle exec kitchen test end-to-end-opensuse-leap
-      after_failure:
-        - cat .kitchen/logs/kitchen.log
-      env:
-       - OPENSUSELEAP=42
-       - KITCHEN_YAML=kitchen.yml
 
 notifications:
   on_change: true
diff --git a/README.md b/README.md
index 638784f169..19c283a098 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Chef Infra
 [![Code Climate](https://codeclimate.com/github/chef/chef.svg)](https://codeclimate.com/github/chef/chef)
-[![Build Status Master](https://travis-ci.org/chef/chef.svg?branch=master)](https://travis-ci.org/chef/chef)
+[![Build Status](https://badge.buildkite.com/c82093430ceec7d27af05febb9dcafe3aa331fff9d74c0ab9d.svg)](https://buildkite.com/chef-oss/chef-chef-master-verify)
 [![Build Status Master](https://ci.appveyor.com/api/projects/status/github/chef/chef?branch=master&svg=true&passingText=master%20-%20Ok&pendingText=master%20-%20Pending&failingText=master%20-%20Failing)](https://ci.appveyor.com/project/Chef/chef/branch/master)
 [![Gem Version](https://badge.fury.io/rb/chef.svg)](https://badge.fury.io/rb/chef)
 [![](https://img.shields.io/badge/Release%20Policy-Cadence%20Release-brightgreen.svg)](https://github.com/chef/chef-rfc/blob/master/rfc086-chef-oss-project-policies.md#cadence-release)
diff --git a/scripts/bk_tests/bk_container_prep.sh b/scripts/bk_tests/bk_container_prep.sh
new file mode 100755
index 0000000000..bf4711ec39
--- /dev/null
+++ b/scripts/bk_tests/bk_container_prep.sh
@@ -0,0 +1,21 @@
+# This script gets a container ready to run our various tests in BuildKite
+
+# make sure we have the network tools in place for various network specs
+if [ -f /etc/debian_version ]; then
+  apt-get update -y && apt-get install -y net-tools iproute2
+  touch /etc/network/interfaces
+elif [ -f /etc/redhat-release ]; then
+  yum install -y net-tools
+fi
+
+# make sure we have the omnibus_overrides specified version of rubygems / bundler
+gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
+gem --version
+gem uninstall bundler -a -x || true
+gem install bundler -v $(grep :bundler omnibus_overrides.rb | cut -d'"' -f2)
+bundle --version
+rm -f .bundle/config
+
+# force all .rspec tests into progress display to reduce line count
+echo --color > .rspec
+echo -fp >> .rspec
diff --git a/scripts/bk_tests/bk_dokken_install.sh b/scripts/bk_tests/bk_dokken_install.sh
deleted file mode 100755
index 3dd03deecf..0000000000
--- a/scripts/bk_tests/bk_dokken_install.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# Install omnibus-toolchain for git bundler and gem
-curl -fsSL https://chef.io/chef/install.sh | sudo bash -s -- -P omnibus-toolchain
-
-# Set Environment Variables
-export BUNDLE_GEMFILE=$PWD/kitchen-tests/Gemfile
-export FORCE_FFI_YAJL=ext
-export CHEF_LICENSE="accept-silent"
-export PATH=/opt/asdf/bin:/opt/asdf/shims:/opt/omnibus-toolchain/embedded/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-
-# Install Dev tools
-sudo yum install -y gcc gcc-c++ openssl-devel readline-devel zlib-devel iptables
-sudo zypper install -y gcc gcc-c++ openssl-devel readline-devel zlib-devel iptables
-
-# Install ASDF software manager
-echo "--- Installing ASDF software version manager from master"
-sudo /opt/omnibus-toolchain/embedded/bin/git clone https://github.com/asdf-vm/asdf.git /opt/asdf
-. /opt/asdf/asdf.sh
-. /opt/asdf/completions/asdf.bash
-
-echo "--- Installing Ruby ASDF plugin"
-/opt/asdf/bin/asdf plugin-add ruby https://github.com/asdf-vm/asdf-ruby.git 
-
-echo "--- Installing Ruby 2.5.5"
-/opt/asdf/bin/asdf install ruby 2.5.5
-/opt/asdf/bin/asdf global ruby 2.5.5
-
-# Update Gems
-gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
-gem install bundler -v $(grep :bundler omnibus_overrides.rb | cut -d'"' -f2) --force --no-document
-sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
-ruby --version
-which bundle
-bundle install --jobs=3 --retry=3 --path=vendor/bundle
\ No newline at end of file
diff --git a/scripts/bk_tests/bk_install.sh b/scripts/bk_tests/bk_install.sh
deleted file mode 100755
index e8fefc2d02..0000000000
--- a/scripts/bk_tests/bk_install.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-apt-get update -y && apt-get install -y net-tools iproute2
-touch /etc/network/interfaces
-gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
-gem --version
-gem uninstall bundler -a -x || true
-gem install bundler -v $(grep :bundler omnibus_overrides.rb | cut -d'"' -f2)
-bundle --version
-rm -f .bundle/config
-# force all .rspec tests into progress display to reduce line count
-echo --color > .rspec
-echo -fp >> .rspec