Pull in testing updates from master branch

Enable additional unit / functional tests
Update platforms we run integration tests on
Remove old macos ulimit bump
Remove old bk_install.sh script we don't use
Install Ruby 2.5.7 not 2.5.6 and 2.6.4

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

5 files changed, 114 insertions, 142 deletions

diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 9a5b654699..83f8cbb6e1 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -16,35 +16,35 @@ steps:
   # Tests Ruby 2.6
 #########################################################################
 
-# - label: "Integration Specs Ubuntu :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/ubuntu-18.04
-#         privileged: true
-#         environment:
-#           - FORCE_FFI_YAJL=ext
-#           - CHEF_LICENSE=accept-no-persist
-#           - BUNDLE_GEMFILE=/workdir/Gemfile
-
-# - label: "Functional Specs Ubuntu :ruby: 2.6"
-#   commands:
-#     - /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
+- label: "Integration Specs Ubuntu :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/ubuntu-18.04
+        privileged: true
+        environment:
+          - FORCE_FFI_YAJL=ext
+          - CHEF_LICENSE=accept-no-persist
+          - BUNDLE_GEMFILE=/workdir/Gemfile
+
+- label: "Functional Specs Ubuntu :ruby: 2.6"
+  commands:
+    - /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
 
 - label: "Unit Specs Ubuntu :ruby: 2.6"
   commands:
@@ -60,20 +60,20 @@ steps:
           - 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: "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:
@@ -104,20 +104,20 @@ steps:
           - 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: "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:
@@ -148,35 +148,35 @@ steps:
           - FORCE_FFI_YAJL=ext
           - CHEF_LICENSE=accept-no-persist
 
-# - 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: "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:
@@ -248,21 +248,20 @@ steps:
   # Tests Ruby 2.5
 #########################################################################
 
-# - label: "Integration Specs :ruby: 2.5"
-#   commands:
-#     - /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
-#           - BUNDLE_GEMFILE=/workdir/Gemfile
+- label: "Integration Specs :ruby: 2.5"
+  commands:
+    - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - bundle install --jobs=3 --retry=3 --without omnibus_package docgen
+    - 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:
@@ -299,7 +298,7 @@ steps:
   # EXTERNAL GEM TESTING
 #########################################################################
 
-- label: "Test chef-sugar-ng gem :ruby: 2.6"
+- 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
@@ -492,11 +491,11 @@ steps:
         privileged: true
         single-use: true
 
-- label: "Kitchen Tests Oracle Linux: 6"
+- label: "Kitchen Tests CentOS: 8"
   commands:
     - scripts/bk_tests/bk_linux_exec.sh
     - cd kitchen-tests
-    - ~/.asdf/shims/bundle exec kitchen test end-to-end-oraclelinux-6
+    - ~/.asdf/shims/bundle exec kitchen test end-to-end-centos-8
   artifact_paths:
     - $PWD/.kitchen/logs/kitchen.log
   env:
@@ -507,11 +506,11 @@ steps:
         privileged: true
         single-use: true
 
-- label: "Kitchen Tests Oracle Linux: 7"
+- label: "Kitchen Tests Oracle Linux: 6"
   commands:
     - scripts/bk_tests/bk_linux_exec.sh
     - cd kitchen-tests
-    - ~/.asdf/shims/bundle exec kitchen test end-to-end-oraclelinux-7
+    - ~/.asdf/shims/bundle exec kitchen test end-to-end-oraclelinux-6
   artifact_paths:
     - $PWD/.kitchen/logs/kitchen.log
   env:
@@ -522,11 +521,11 @@ steps:
         privileged: true
         single-use: true
 
-- label: "Kitchen Tests Oracle Linux: 8"
+- label: "Kitchen Tests Oracle Linux: 7"
   commands:
     - scripts/bk_tests/bk_linux_exec.sh
     - cd kitchen-tests
-    - ~/.asdf/shims/bundle exec kitchen test end-to-end-oraclelinux-8
+    - ~/.asdf/shims/bundle exec kitchen test end-to-end-oraclelinux-7
   artifact_paths:
     - $PWD/.kitchen/logs/kitchen.log
   env:
@@ -552,21 +551,6 @@ steps:
         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-42
-  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: 15"
   commands:
     - scripts/bk_tests/bk_linux_exec.sh
diff --git a/omnibus/omnibus-test.sh b/omnibus/omnibus-test.sh
index 963b91c4b8..95ac30bec4 100644
--- a/omnibus/omnibus-test.sh
+++ b/omnibus/omnibus-test.sh
@@ -147,9 +147,6 @@ elif [[ -d /usr/local/etc/sudoers.d ]]; then
   sudo chmod 440 "/usr/local/etc/sudoers.d/$(id -un)-preserve_path"
 fi
 
-# REDO 20190813 - this ulimit can be removed once the macos anka images are updated to support more than 256 open files
-ulimit -S -n 512
-
 cd "$chef_gem"
 sudo -E bundle install
 sudo -E bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f documentation spec/functional
diff --git a/scripts/bk_tests/bk_install.sh b/scripts/bk_tests/bk_install.sh
deleted file mode 100755
index de74af151c..0000000000
--- a/scripts/bk_tests/bk_install.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-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_linux_exec.sh b/scripts/bk_tests/bk_linux_exec.sh
index 805397a361..cc8842bcf3 100755
--- a/scripts/bk_tests/bk_linux_exec.sh
+++ b/scripts/bk_tests/bk_linux_exec.sh
@@ -32,9 +32,9 @@ sudo git clone https://github.com/asdf-vm/asdf.git /opt/asdf
 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.6"
-/opt/asdf/bin/asdf install ruby 2.5.6
-/opt/asdf/bin/asdf global ruby 2.5.6
+echo "--- Installing Ruby 2.5.7"
+/opt/asdf/bin/asdf install ruby 2.5.7
+/opt/asdf/bin/asdf global ruby 2.5.7
 
 # Update Gems
 gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
diff --git a/scripts/bk_tests/bk_win_functional.ps1 b/scripts/bk_tests/bk_win_functional.ps1
index 085f22e40c..23b7263529 100755
--- a/scripts/bk_tests/bk_win_functional.ps1
+++ b/scripts/bk_tests/bk_win_functional.ps1
@@ -14,17 +14,17 @@ $ErrorActionPreference = 'Stop'
 
 echo "Downloading Ruby + DevKit"
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-(New-Object System.Net.WebClient).DownloadFile('https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.4-1/rubyinstaller-devkit-2.6.4-1-x64.exe', 'c:\\rubyinstaller-devkit-2.6.4-1-x64.exe')
+(New-Object System.Net.WebClient).DownloadFile('https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.5.7-1/rubyinstaller-devkit-2.6.5-1-x64.exe', 'c:\\rubyinstaller-devkit-2.6.5-1-x64.exe')
 
 echo "Installing Ruby + DevKit"
-Start-Process c:\rubyinstaller-devkit-2.6.4-1-x64.exe -ArgumentList '/verysilent /dir=C:\\ruby26' -Wait
+Start-Process c:\rubyinstaller-devkit-2.5.7-1-x64.exe -ArgumentList '/verysilent /dir=C:\\ruby26' -Wait
 
 echo "Cleaning up installation"
-Remove-Item c:\rubyinstaller-devkit-2.6.4-1-x64.exe -Force
+Remove-Item c:\rubyinstaller-devkit-2.5.7-1-x64.exe -Force
 echo "Closing out the layer (this can take awhile)"
 
 # Set-Item -Path Env:Path -Value to include ruby26
-$Env:Path+=";C:\ruby26\bin"
+$Env:Path+=";C:\ruby25\bin"
 
 winrm quickconfig -q
 ruby -v