Revert back to working testsjsinha/add_bk_verify

Signed-off-by: Jaymala Sinha <jsinha@chef.io>

1 files changed, 39 insertions, 43 deletions

diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 8db4226bd1..9df22e231d 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -2,7 +2,7 @@
 expeditor:
   defaults:
     buildkite:
-      timeout_in_minutes: 40
+      timeout_in_minutes: 30
 
 steps:
 
@@ -206,7 +206,7 @@ steps:
         privileged: true
         single-use: true
 
-- label: "Kitchen Tests :ubuntu: 16.04 :ruby: 2.5"
+- label: "Kitchen Tests Ubuntu: 16.04 :ruby: 2.5"
   commands:
     - scripts/bk_tests/bk_linux_exec.sh
     - cd kitchen-tests
@@ -222,7 +222,7 @@ steps:
         privileged: true
         single-use: true
 
-- label: "Kitchen Tests :ubuntu: 18.04 :ruby: 2.5"
+- label: "Kitchen Tests Ubuntu: 18.04 :ruby: 2.5"
   commands:
     - scripts/bk_tests/bk_linux_exec.sh
     - cd kitchen-tests
@@ -238,7 +238,7 @@ steps:
         privileged: true
         single-use: true
 
-- label: "Kitchen Tests :debian: 8 :ruby: 2.5"
+- label: "Kitchen Tests Debian: 8 :ruby: 2.5"
   commands:
     - scripts/bk_tests/bk_linux_exec.sh
     - cd kitchen-tests
@@ -254,7 +254,7 @@ steps:
         privileged: true
         single-use: true
 
-- label: "Kitchen Tests :debian: 9 :ruby: 2.5"
+- label: "Kitchen Tests Debian: 9 :ruby: 2.5"
   commands:
     - scripts/bk_tests/bk_linux_exec.sh
     - cd kitchen-tests
@@ -270,7 +270,7 @@ steps:
         privileged: true
         single-use: true
 
-- label: "Kitchen Tests :debian: 10 :ruby: 2.5"
+- label: "Kitchen Tests Debian: 10 :ruby: 2.5"
   commands:
     - scripts/bk_tests/bk_linux_exec.sh
     - cd kitchen-tests
@@ -286,7 +286,7 @@ steps:
         privileged: true
         single-use: true
 
-- label: "Kitchen Tests :centos: 6 :ruby: 2.5"
+- label: "Kitchen Tests Centos: 6 :ruby: 2.5"
   commands:
     - scripts/bk_tests/bk_linux_exec.sh
     - cd kitchen-tests
@@ -302,7 +302,7 @@ steps:
         privileged: true
         single-use: true
 
-- label: "Kitchen Tests :centos: 7 :ruby: 2.5"
+- label: "Kitchen Tests Centos: 7 :ruby: 2.5"
   commands:
     - scripts/bk_tests/bk_linux_exec.sh
     - cd kitchen-tests
@@ -318,7 +318,7 @@ steps:
         privileged: true
         single-use: true
 
-- label: "Kitchen Tests :fedora: latest :ruby: 2.5"
+- label: "Kitchen Tests Fedora: latest :ruby: 2.5"
   commands:
     - scripts/bk_tests/bk_linux_exec.sh
     - cd kitchen-tests
@@ -350,38 +350,34 @@ steps:
         privileged: true
         single-use: true
 
-#########################################################################
-  # RSpec Tests
-#########################################################################
-# - label: "Kitchen Tests :rspec: :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:
-#       RSPEC_CENTOS: "7"
-#       KITCHEN_YAML: kitchen.yml
-#   expeditor:
-#     executor:
-#       linux:
-#         privileged: true
-#         single-use: true
+- label: "Kitchen Tests Rspec 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:
+      RSPEC_CENTOS: "7"
+      KITCHEN_YAML: kitchen.yml
+  expeditor:
+    executor:
+      linux:
+        privileged: true
+        single-use: true
 
-# - label: "Kitchen Tests :rspec: OPENSUSELEAP: 42 :ruby: 2.5"
-#   commands:
-#     - /workdir/scripts/bk_tests/bk_dokken_install.sh
-#     - bundle install --without docgen integration omnibus_package --frozen --path vendor/bundle
-#     - bundle exec rspec
-#   artifact_paths:
-#   - $PWD/.kitchen/logs/kitchen.log
-#   expeditor:
-#     executor:
-#       docker:
-#         image: "dokken/opensuse-leap"
-#         environment:
-#           - RSPEC_OPENSUSELEAP="42"
-#           - FORCE_FFI_YAJL=ext
-#           - CHEF_LICENSE="accept-silent"
-#           - PATH=~/.asdf/shims:/opt/asdf/bin:/opt/asdf/shims:/opt/omnibus-toolchain/embedded/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
\ No newline at end of file
+- label: "Kitchen Tests Rspec OPENSUSELEAP: 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:
+      RSPEC_OPENSUSELEAP: "42"
+      KITCHEN_YAML: kitchen.yml
+  expeditor:
+    executor:
+      linux:
+        privileged: true
+        single-use: true