Merge pull request #8870 from chef/jsinha/update_platforms+ruby

Jsinha/update platforms+ruby

10 files changed, 546 insertions, 189 deletions

diff --git a/.expeditor/release.omnibus.yml b/.expeditor/release.omnibus.yml
index 373bf7b3f9..adbbcdba84 100644
--- a/.expeditor/release.omnibus.yml
+++ b/.expeditor/release.omnibus.yml
@@ -32,10 +32,10 @@ builder-to-testers-map:
   freebsd-11-amd64:
     - freebsd-11-amd64
     - freebsd-12-amd64
-  mac_os_x-10.12-x86_64:
-    - mac_os_x-10.12-x86_64
+  mac_os_x-10.13-x86_64:
     - mac_os_x-10.13-x86_64
     - mac_os_x-10.14-x86_64
+    - mac_os_x-10.15-x86_64
   sles-12-s390x:
     - sles-12-s390x
   sles-12-x86_64:
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 5aaa0aefda..78336123b9 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -1,121 +1,244 @@
+---
+expeditor:
+  defaults:
+    buildkite:
+      retry:
+        automatic:
+          limit: 1
+      timeout_in_minutes: 30
+      retry:
+        automatic:
+          limit: 1
+
 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
-#     - sed '/ip6/d' /etc/hosts > /etc/hosts.noip6
-#     - cp /etc/hosts.noip6 /etc/hosts
-#     - cd /workdir; bundle install --without ci docgen guard integration omnibus_package --frozen
+#     - /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/ubuntu-18.04
+#         privileged: true
 #         environment:
 #           - FORCE_FFI_YAJL=ext
 #           - CHEF_LICENSE=accept-no-persist
-#           - INTEGRATION_SPECS_26=1
 #           - 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
-#     - sed '/ip6/d' /etc/hosts > /etc/hosts.noip6
-#     - cp /etc/hosts.noip6 /etc/hosts
-#     - cd /workdir; bundle install --without ci docgen guard integration omnibus_package --frozen
+#     - /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: rubydistros/ubuntu-18.04
+#         privileged: true
 #         environment:
 #           - FORCE_FFI_YAJL=ext
 #           - CHEF_LICENSE=accept-no-persist
-#           - FUNCTIONAL_SPECS_26=1
 
-- label: "Unit Specs :ruby: 2.6"
+- label: "Unit Specs Ubuntu :ruby: 2.6"
   commands:
-    - /workdir/scripts/bk_tests/bk_install.sh
-    - bundle install --without ci docgen guard integration omnibus_package --frozen
+    - /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/ubuntu-18.04
         environment:
           - FORCE_FFI_YAJL=ext
           - CHEF_LICENSE=accept-no-persist
-          - UNIT_SPECS_26=1
 
-- label: "Chefstyle :ruby: 2.6"
+# - 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_install.sh
-    - bundle install --jobs=3 --retry=3 --deployment --path=vendor/bundle
-    - bundle exec rake style
+    - /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:
-          - CHEFSTYLE=1
+          - FORCE_FFI_YAJL=ext
+          - CHEF_LICENSE=accept-no-persist
 
-- label: "Test chef-sugar gem :ruby: 2.6"
+- label: "Unit Specs CentOS :ruby: 2.6"
   commands:
-    - /workdir/scripts/bk_tests/bk_install.sh
-    - bundle install --jobs=3 --retry=3 --deployment --path=vendor/bundle
-    - bundle exec tasks/bin/run_external_test sethvargo/chef-sugar master rake
+    - /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:
-          - TEST_GEM=sethvargo/chef-sugar
+          - FORCE_FFI_YAJL=ext
+          - CHEF_LICENSE=accept-no-persist
 
-- label: "Test chef-zero gem :ruby: 2.6"
+# - 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_install.sh
-    - bundle install --jobs=3 --retry=3 --deployment --path=vendor/bundle
-    - bundle exec tasks/bin/run_external_test chef/chef-zero master rake pedant
+    - /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:
-          - TEST_GEM=chef/chef-zero
-          - PEDANT_OPTS=--skip-oc_id
-          - CHEF_FS=true
+          - FORCE_FFI_YAJL=ext
+          - CHEF_LICENSE=accept-no-persist
 
-- label: "Test cheffish gem :ruby: 2.6"
+- label: "Unit Specs openSUSE :ruby: 2.6"
   commands:
-    - /workdir/scripts/bk_tests/bk_install.sh
-    - bundle install --jobs=3 --retry=3 --deployment --path=vendor/bundle
-    - bundle exec tasks/bin/run_external_test chef/cheffish master rake spec
+    - /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:
-          - TEST_GEM=chef/cheffish
+          - FORCE_FFI_YAJL=ext
+          - CHEF_LICENSE=accept-no-persist
 
-- label: "Test chefspec gem :ruby: 2.6"
+# - label: "Integration Specs Fedora :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/fedora-latest
+#         privileged: true
+#         environment:
+#           - FORCE_FFI_YAJL=ext
+#           - CHEF_LICENSE=accept-no-persist
+#           - BUNDLE_GEMFILE=/workdir/Gemfile
+
+# - label: "Functional Specs Fedora :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/fedora-latest
+#         privileged: true
+#         environment:
+#           - FORCE_FFI_YAJL=ext
+#           - CHEF_LICENSE=accept-no-persist
+
+- label: "Unit Specs Fedora :ruby: 2.6"
   commands:
-    - /workdir/scripts/bk_tests/bk_install.sh
-    - bundle install --jobs=3 --retry=3 --deployment --path=vendor/bundle
-    - bundle exec tasks/bin/run_external_test chefspec/chefspec master rake
+    - /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/fedora-latest
         environment:
-          - TEST_GEM=chefspec/chefspec
+          - FORCE_FFI_YAJL=ext
+          - CHEF_LICENSE=accept-no-persist
 
-- label: "Test knife-windows gem :ruby: 2.6"
+- label: "Integration Specs Windows :ruby: 2.6"
   commands:
-    - /workdir/scripts/bk_tests/bk_install.sh
-    - bundle install --jobs=3 --retry=3 --deployment --path=vendor/bundle
-    - bundle exec tasks/bin/run_external_test chef/knife-windows master rake unit_spec
+    - /workdir/scripts/bk_tests/bk_win_integration.ps1
+  expeditor:
+    executor:
+      docker:
+        host_os: windows
+        os_version: 2016
+        environment:
+          - FORCE_FFI_YAJL=ext
+          - CHEF_LICENSE=accept-no-persist
+        shell: ["powershell", "-Command"]
+
+- label: "Functional Specs Windows :ruby: 2.6"
+  commands:
+    - /workdir/scripts/bk_tests/bk_win_functional.ps1
   expeditor:
     executor:
       docker:
+        host_os: windows
+        os_version: 2016
         environment:
-          - TEST_GEM=chef/knife-windows
+          - FORCE_FFI_YAJL=ext
+          - CHEF_LICENSE=accept-no-persist
+        shell: ["powershell", "-Command"]
+
+- label: "Unit Specs Windows :ruby: 2.6"
+  commands:
+    - /workdir/scripts/bk_tests/bk_win_unit.ps1
+  expeditor:
+    executor:
+      docker:
+        host_os: windows
+        environment:
+          - FORCE_FFI_YAJL=ext
+          - CHEF_LICENSE=accept-no-persist
+        shell: ["powershell", "-Command"]
+
+- label: "Chefstyle :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 style
+  expeditor:
+    executor:
+      docker:
+        image: rubydistros/ubuntu-18.04
 
 #########################################################################
   # Tests Ruby 2.5
@@ -123,68 +246,274 @@ steps:
 
 # - label: "Integration Specs :ruby: 2.5"
 #   commands:
-#     - /workdir/scripts/bk_tests/bk_install.sh
-#     - asdf local ruby 2.5.5
-#     - sed '/ip6/d' /etc/hosts > /etc/hosts.noip6
-#     - cp /etc/hosts.noip6 /etc/hosts
-#     - bundle install --without ci docgen guard integration omnibus_package --frozen
+#     - /workdir/scripts/bk_tests/bk_container_prep.sh
+#     - bundle install --jobs=3 --retry=3 --without ci docgen guard integration omnibus_package --path vendor/bundle
 #     - bundle exec rake spec:integration
 #   expeditor:
 #     executor:
 #       docker:
+#         image: ruby:2.5-stretch
+#         privileged: true
 #         environment:
 #           - FORCE_FFI_YAJL=ext
 #           - CHEF_LICENSE=accept-no-persist
 #           - INTEGRATION_SPECS_25=1
-#
-# - label: "Functional Specs :ruby: 2.5"
-#   commands:
-#     - asdf local ruby 2.5.5
-#     - /workdir/scripts/bk_tests/bk_install.sh
-#     - sed '/ip6/d' /etc/hosts > /etc/hosts.noip6
-#     - cp /etc/hosts.noip6 /etc/hosts
-#     - bundle install --without ci docgen guard integration omnibus_package --frozen
-#     - bundle exec rake spec:functional
-#   expeditor:
-#     executor:
-#       docker:
-#         environment:
-#           - FORCE_FFI_YAJL=ext
-#           - CHEF_LICENSE=accept-no-persist
-#           - FUNCTIONAL_SPECS_25=1
+#           - BUNDLE_GEMFILE=/workdir/Gemfile
+
+- label: "Functional Specs :ruby: 2.5"
+  commands:
+    - /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
+  expeditor:
+    executor:
+      docker:
+        image: ruby:2.5-stretch
+        privileged: true
+        environment:
+          - FORCE_FFI_YAJL=ext
+          - CHEF_LICENSE=accept-no-persist
+          - FUNCTIONAL_SPECS_25=1
 
 - label: "Unit Specs :ruby: 2.5"
   commands:
-    - asdf local ruby 2.5.5
-    - /workdir/scripts/bk_tests/bk_install.sh
-    - bundle install --without ci docgen guard integration omnibus_package --frozen
+    - /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
   expeditor:
     executor:
       docker:
+        image: ruby:2.5-stretch
         environment:
           - FORCE_FFI_YAJL=ext
           - CHEF_LICENSE=accept-no-persist
           - UNIT_SPECS_25=1
 
 #########################################################################
+  # EXTERNAL GEM TESTING
+#########################################################################
+
+- label: "Test chef-sugar gem :ruby: 2.6"
+  commands:
+    - /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: rubydistros/ubuntu-18.04
+
+- label: "Test chef-zero gem :ruby: 2.6"
+  commands:
+    - /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: 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_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: rubydistros/ubuntu-18.04
+
+- label: "Test chefspec gem :ruby: 2.6"
+  commands:
+    - /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: rubydistros/ubuntu-18.04
+
+- label: "Test knife-windows gem :ruby: 2.6"
+  commands:
+    - /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: rubydistros/ubuntu-18.04
+
+#########################################################################
   # START TEST KITCHEN ONLY
 #########################################################################
 
-# - label: "Kitchen Tests :ruby: 2.5"
-#   commands:
-#     - /workdir/scripts/bk_tests/bk_install.sh
-#     - asdf local ruby 2.5.5
-#     - sed '/ip6/d' /etc/hosts > /etc/hosts.noip6
-#     - cp /etc/hosts.noip6 /etc/hosts
-#     - cd /workdir/kitchen-tests
-#     - bundle install --jobs=3 --retry=3 --path=vendor/bundle
-#     - bundle exec kitchen test end-to-end-amazonlinux-2
-#   expeditor:
-#     executor:
-#       docker:
-#         environment:
-#           - AMAZON=2
-#           - KITCHEN_YAML=/workdir/kitchen-tests/kitchen.bk.yml
-#           - BUNDLE_GEMFILE=/workdir/kitchen-tests/Gemfile
+- 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
\ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index 3fe5e7b456..0000000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-version: "master-{build}"
-
-os: Visual Studio 2017
-platform:
-  - x64
-
-cache:
-  - vendor/bundle
-
-configuration:
-  - integration
-  - functional
-  - unit
-
-environment:
-  matrix:
-    - ruby_version: "25-x64"
-
-clone_folder: c:\projects\chef
-clone_depth: 1
-
-skip_commits:
-  # version bumps by Expeditor happen as a separate commit after the merge, we can skip
-  message: /Bump version to [0-9.]+ by Chef Expeditor/
-  # if ONLY the files listed below are changed in a commit, skip
-  files:
-    - MAINTAINERS.md
-    - MAINTAINERS.toml
-    - CHANGELOG.md
-    - RELEASE_NOTES.md
-
-skip_tags: true
-branches:
-  only:
-    - master
-    - chef-14
-    - chef-13
-
-install:
-  - systeminfo
-  - winrm quickconfig -q
-  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
-  - echo %PATH%
-  - appveyor DownloadFile http://curl.haxx.se/ca/cacert.pem -FileName C:\cacert.pem
-  - set SSL_CERT_FILE=C:\cacert.pem
-  - SET BUNDLE_WITHOUT=server:docgen:pry:integration:ci
-  - bundle config --local path vendor/bundle # use the cache we define above
-  - bundle install || bundle install || bundle install
-  - SET SPEC_OPTS=--format progress
-
-build: off
-
-before_test:
-  - ruby --version
-  - gem --version
-  - bundler --version
-  - bundle env
-
-for:
-  -
-    matrix:
-      only:
-        - configuration: integration
-    build_script:
-      - bundle exec rake spec:integration
-  -
-    matrix:
-      only:
-        - configuration: functional
-    build_script:
-      - bundle exec rake spec:functional
-  -
-    matrix:
-      only:
-        - configuration: unit
-    build_script:
-      - bundle exec rake spec:unit
-      - bundle exec rake component_specs
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index a4903f8541..715c34b5b8 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/chef/omnibus
-  revision: c4c0c518caf5c559ddf3d0ae773013d5dbc6bd3c
+  revision: c872e61c30d2b3f88ead03bd1254ff96d37059a3
   branch: master
   specs:
-    omnibus (6.1.2)
+    omnibus (6.1.3)
       aws-sdk-s3 (~> 1)
       chef-sugar (>= 3.3)
       cleanroom (~> 1.0)
@@ -18,7 +18,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: 5fa35959f6efb0a5a745c46e4b0431a2826934da
+  revision: 82ff3963cf4624afd77dfd283a187e25d21325b9
   branch: master
   specs:
     omnibus-software (4.0.0)
@@ -28,13 +28,13 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     artifactory (3.0.5)
     awesome_print (1.8.0)
     aws-eventstream (1.0.3)
-    aws-partitions (1.202.0)
-    aws-sdk-core (3.62.0)
+    aws-partitions (1.211.0)
+    aws-sdk-core (3.67.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.1)
@@ -42,7 +42,7 @@ GEM
     aws-sdk-kms (1.24.0)
       aws-sdk-core (~> 3, >= 3.61.1)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.46.0)
+    aws-sdk-s3 (1.48.0)
       aws-sdk-core (~> 3, >= 3.61.1)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
@@ -201,7 +201,7 @@ GEM
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
     method_source (0.9.2)
-    minitar (0.8)
+    minitar (0.9)
     mixlib-archive (1.0.1)
       mixlib-log
     mixlib-archive (1.0.1-universal-mingw32)
@@ -210,7 +210,7 @@ GEM
     mixlib-cli (2.1.1)
     mixlib-config (3.0.1)
       tomlrb
-    mixlib-install (3.11.18)
+    mixlib-install (3.11.21)
       mixlib-shellout
       mixlib-versioning
       thor
@@ -271,7 +271,7 @@ GEM
     pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (3.1.1)
+    public_suffix (4.0.1)
     rack (2.0.7)
     retryable (3.0.4)
     rspec (3.8.0)
@@ -295,12 +295,12 @@ GEM
       rspec-core (>= 2, < 4, != 2.12.0)
     ruby-progressbar (1.10.1)
     rubyntlm (0.6.2)
-    rubyzip (1.2.3)
+    rubyzip (1.2.4)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
     semverse (3.0.0)
-    serverspec (2.41.4)
+    serverspec (2.41.5)
       multi_json
       rspec (~> 3.0)
       rspec-its
@@ -314,20 +314,20 @@ GEM
       net-ssh (>= 2.7)
       net-telnet (= 0.1.1)
       sfl
-    strings (0.1.5)
+    strings (0.1.6)
       strings-ansi (~> 0.1)
       unicode-display_width (~> 1.5)
       unicode_utils (~> 1.4)
     strings-ansi (0.1.0)
-    structured_warnings (0.3.0)
+    structured_warnings (0.4.0)
     syslog-logger (1.6.8)
     systemu (2.6.5)
-    test-kitchen (2.2.5)
+    test-kitchen (2.3.2)
       bcrypt_pbkdf (~> 1.0)
       ed25519 (~> 1.2)
       license-acceptance (~> 1.0, >= 1.0.11)
       mixlib-install (~> 3.6)
-      mixlib-shellout (>= 1.2, < 3.0)
+      mixlib-shellout (>= 1.2, < 4.0)
       net-scp (>= 1.1, < 3.0)
       net-ssh (>= 2.9, < 6.0)
       net-ssh-gateway (>= 1.2, < 3.0)
@@ -339,9 +339,9 @@ GEM
     toml-rb (1.1.2)
       citrus (~> 3.0, > 3.0)
     tomlrb (1.2.8)
-    tty-box (0.4.0)
+    tty-box (0.4.1)
       pastel (~> 0.7.2)
-      strings (~> 0.1.5)
+      strings (~> 0.1.6)
       tty-cursor (~> 0.7)
     tty-color (0.5.0)
     tty-cursor (0.7.0)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 98168d4da0..91fcaa59b7 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -17,7 +17,7 @@ override "libyaml", version: "0.1.7"
 override "makedepend", version: "1.0.5"
 override "ncurses", version: "5.9"
 override "pkg-config-lite", version: "0.28-1"
-override "ruby", version: "2.5.5"
+override "ruby", version: "2.5.6"
 override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18"
 override "util-macros", version: "1.19.0"
 override "xproto", version: "7.0.28"
diff --git a/scripts/bk_tests/bk_container_prep.sh b/scripts/bk_tests/bk_container_prep.sh
new file mode 100755
index 0000000000..1718c45b72
--- /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
\ No newline at end of file
diff --git a/scripts/bk_tests/bk_linux_exec.sh b/scripts/bk_tests/bk_linux_exec.sh
new file mode 100755
index 0000000000..fee73aa6bb
--- /dev/null
+++ b/scripts/bk_tests/bk_linux_exec.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# Enable IPv6 in docker
+sudo systemctl stop docker
+echo "Enabling IPv6 in Docker config"
+dockerd_config="/etc/docker/daemon.json"
+sudo echo "$(jq '. + {"ipv6": true, "fixed-cidr-v6": "2001:2019:6002::/80", "ip-forward": false}' $dockerd_config)" > $dockerd_config
+sudo systemctl start docker
+
+# Verify Docker Is Running
+docker version
+sudo service docker status
+
+# Install C and C++
+sudo yum install -y gcc gcc-c++ openssl-devel readline-devel zlib-devel
+
+# 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=$PATH:~/.asdf/shims:/opt/asdf/bin:/opt/asdf/shims:/opt/omnibus-toolchain/embedded/bin
+
+# Install ASDF software manager
+echo "--- Installing ASDF software version manager from master"
+sudo 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_win_functional.ps1 b/scripts/bk_tests/bk_win_functional.ps1
new file mode 100755
index 0000000000..06695ccd97
--- /dev/null
+++ b/scripts/bk_tests/bk_win_functional.ps1
@@ -0,0 +1,13 @@
+echo "--- system details"
+$Properties = 'Caption', 'CSName', 'Version', 'BuildType', 'OSArchitecture'
+Get-CimInstance Win32_OperatingSystem | Select-Object $Properties | Format-Table -AutoSize
+ruby -v
+bundle --version
+
+echo "--- bundle install"
+bundle install --jobs=3 --retry=3 --without omnibus_package docgen chefstyle
+
+echo "+++ bundle exec rake"
+bundle exec rake spec:functional
+
+exit $LASTEXITCODE
\ No newline at end of file
diff --git a/scripts/bk_tests/bk_win_integration.ps1 b/scripts/bk_tests/bk_win_integration.ps1
new file mode 100755
index 0000000000..c6cdd5e2b1
--- /dev/null
+++ b/scripts/bk_tests/bk_win_integration.ps1
@@ -0,0 +1,13 @@
+echo "--- system details"
+$Properties = 'Caption', 'CSName', 'Version', 'BuildType', 'OSArchitecture'
+Get-CimInstance Win32_OperatingSystem | Select-Object $Properties | Format-Table -AutoSize
+ruby -v
+bundle --version
+
+echo "--- bundle install"
+bundle install --jobs=3 --retry=3 --without omnibus_package docgen chefstyle
+
+echo "+++ bundle exec rake"
+bundle exec rake spec:integration
+
+exit $LASTEXITCODE
\ No newline at end of file
diff --git a/scripts/bk_tests/bk_win_unit.ps1 b/scripts/bk_tests/bk_win_unit.ps1
new file mode 100755
index 0000000000..48ad3fe283
--- /dev/null
+++ b/scripts/bk_tests/bk_win_unit.ps1
@@ -0,0 +1,14 @@
+echo "--- system details"
+$Properties = 'Caption', 'CSName', 'Version', 'BuildType', 'OSArchitecture'
+Get-CimInstance Win32_OperatingSystem | Select-Object $Properties | Format-Table -AutoSize
+ruby -v
+bundle --version
+
+echo "--- bundle install"
+bundle install --jobs=3 --retry=3 --without omnibus_package docgen chefstyle
+
+echo "+++ bundle exec rake"
+bundle exec rake spec:unit
+bundle exec rake component_specs
+
+exit $LASTEXITCODE
\ No newline at end of file