DataDog · KSerrania · Feb 1, 2023 · Jan 25, 2023
@@ -178,17 +178,6 @@ platforms:
     username: <%= vm_username %>
     password: <%= vm_password %>
 
-  lifecycle:
-    # HACK: this is needed to install rexml for system-probe tests without using bundler, which cannot be used for now
-    # (see the explanation in tasks/run-test-kitchen.sh).
-    pre_verify:
-      - local: echo 'Installing rexml gem for the system-probe-test suite'
-      <% if windows %>
-      - remote: C:/opscode/chef/embedded/bin/gem.bat install rexml --install-dir C:/Users/<%= vm_username %>/AppData/Local/Temp/verifier/gems
-      <% else %>
-      - remote: /opt/chef/embedded/bin/gem install rexml --install-dir /tmp/verifier/gems
-      <% end %>
-
   transport:
     <% if windows %>
     name: winrm

@@ -146,15 +146,6 @@ platforms:
           let i+=${wait};
         done;
   <% end %>
-    # HACK: this is needed to install rexml for system-probe tests without using bundler, which cannot be used for now
-    # (see the explanation in tasks/run-test-kitchen.sh).
-    pre_verify:
-      - local: echo 'Installing rexml gem for the system-probe-test suite'
-      <% if windows %>
-      - remote: C:/opscode/chef/embedded/bin/gem.bat install rexml --install-dir C:/Users/ec2-user/AppData/Local/Temp/verifier/gems
-      <% else %>
-      - remote: /opt/chef/embedded/bin/gem install rexml --install-dir /tmp/verifier/gems
-      <% end %>
   verifier:
     downloads:
       "/tmp/junit.tar.gz": kitchen-junit-<%= platform_name %>.tar.gz

@@ -149,23 +149,8 @@ set +o pipefail
 test_suites=".*"
 # This for loop retries kitchen tests failing because of infrastructure/networking issues
 for attempt in $(seq 0 "${KITCHEN_INFRASTRUCTURE_FLAKES_RETRY:-2}"); do
-  bundle exec kitchen converge "$test_suites" -c -d always 2>&1 | tee "/tmp/runlog${attempt}"
-  converge_result=${PIPESTATUS[0]}
-
-  # HACK: Since December 24, 2022, the first verify attempt always fails, due to a bundler <-> ruby
-  # version issue at the start of the verifier.
-  # The kitchen verifier uses the latest version of busser (0.8.0). busser detects that we have rspec tests,
-  # and therefore installs the latest version of the busser-rspec gem (0.7.6).
-  # The busser-rspec gem has a postinstall hook that installs the latest versions of the rspec and bundler gems.
-  # The rspec install goes fine, but the bundler install fails since December 24, 2022, when 2.4.0 of bundler
-  # was released, which drops support for ruby < 2.6.
-  # Running kitchen verify another time does work, because the postinstall hook isn't run again,
-  # and we don't actually need bundler in the test suites (for suites that do have depedencies, we install them
-  # manually with lifecycle hooks in the platform definitions).
-  bundle exec kitchen verify "$test_suites" --no-log-overwrite -c -d always 2>&1 || true
-
-  bundle exec kitchen verify "$test_suites" --no-log-overwrite -c -d always 2>&1 | tee -a "/tmp/runlog${attempt}"
-  verify_result=${PIPESTATUS[0]}
+  bundle exec kitchen verify "$test_suites" -c -d always 2>&1 | tee "/tmp/runlog${attempt}"
+  result=${PIPESTATUS[0]}
 
   # Before destroying the kitchen machines, get the list of failed suites,
   # as their status will be reset to non-failing once they're destroyed.
@@ -186,7 +171,7 @@ for attempt in $(seq 0 "${KITCHEN_INFRASTRUCTURE_FLAKES_RETRY:-2}"); do
     break
   fi
 
-  if [ "$converge_result" -eq 0 ] && [ "$verify_result" -eq 0 ]; then
+  if [ "$result" -eq 0 ]; then
       # if kitchen test succeeded, exit with 0
       exit 0
   else

@@ -0,0 +1 @@
+../../common/rspec_datadog/spec_helper.rb
@@ -0,0 +1 @@
+../../common/rspec_datadog/dogstatsd_spec_helper.rb
@@ -0,0 +1 @@
+../../common/rspec_datadog/iot_spec_helper.rb
@@ -0,0 +1 @@
+../../common/rspec_datadog/spec_helper.rb
@@ -0,0 +1 @@
+../../common/rspec_datadog/kernel_out_spec_helper.rb
@@ -0,0 +1 @@
+../../common/rspec_datadog/spec_helper.rb
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem 'rspec'
+gem 'rexml'
@@ -0,0 +1 @@
+../../common/rspec_datadog/kernel_out_spec_helper.rb
@@ -0,0 +1 @@
+../../common/rspec_datadog/spec_helper.rb
@@ -0,0 +1 @@
+../../upgrade/rspec_datadog/upgrade_spec.rb
@@ -0,0 +1 @@
+../../common/rspec_datadog/spec_helper.rb
@@ -0,0 +1 @@
+../../upgrade/rspec_datadog/upgrade_spec.rb
@@ -0,0 +1 @@
+../../common/rspec_datadog/spec_helper.rb
@@ -0,0 +1 @@
+../../upgrade/rspec_datadog/upgrade_spec.rb
@@ -0,0 +1 @@
+../../common/rspec_datadog/spec_helper.rb
@@ -0,0 +1 @@
+../../common/rspec_datadog/spec_helper.rb
@@ -0,0 +1 @@
+../../common/rspec_datadog/spec_helper.rb
@@ -0,0 +1 @@
+../../common/rspec_datadog/spec_helper.rb
@@ -0,0 +1 @@
+../../common/rspec_datadog/spec_helper.rb
@@ -0,0 +1 @@
+../../common/rspec_datadog/spec_helper.rb
@@ -0,0 +1 @@
+../../common/rspec_datadog/windows_npm_spec_helper.rb
@@ -0,0 +1 @@
+../../common/rspec_datadog/spec_helper.rb
@@ -0,0 +1 @@
+../../common/rspec_datadog/windows_npm_spec_helper.rb
@@ -0,0 +1 @@
+../../common/rspec_datadog/spec_helper.rb
@@ -0,0 +1 @@
+../../common/rspec_datadog/windows_npm_spec_helper.rb
@@ -0,0 +1 @@
+../../common/rspec_datadog/spec_helper.rb
@@ -0,0 +1 @@
+../../common/rspec_datadog/windows_npm_spec_helper.rb
@@ -0,0 +1 @@
+../../common/rspec_datadog/spec_helper.rb
@@ -0,0 +1 @@
+../../common/rspec_datadog/windows_npm_spec_helper.rb
@@ -0,0 +1 @@
+../../common/rspec_datadog/spec_helper.rb
@@ -0,0 +1 @@
+../../common/rspec_datadog/windows_npm_spec_helper.rb
@@ -0,0 +1 @@
+../../common/rspec_datadog/spec_helper.rb
@@ -0,0 +1 @@
+../../common/rspec_datadog/spec_helper.rb
@@ -0,0 +1 @@
+../../common/rspec_datadog/windows_npm_spec_helper.rb
@@ -0,0 +1 @@
+../../common/rspec_datadog/spec_helper.rb
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../common/rspec_datadog/dogstatsd_spec_helper.rb
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../common/rspec_datadog/kernel_out_spec_helper.rb
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../common/rspec_datadog/windows_npm_spec_helper.rb