Updates Rakefiles for testing API

Author: picandocodigo

elasticsearch-api/Rakefile

@@ -38,12 +38,6 @@ namespace :test do
     t.ruby_opts = '-W0'
   end
 
-  desc 'Run Elasticsearch test suite free tests.'
-  RSpec::Core::RakeTask.new(:rest_api) do |t|
-    test_dir = Rake.application.original_dir
-    t.pattern = "#{test_dir}/spec/rest_api/rest_api_yaml_spec.rb"
-  end
-
   desc 'Run unit and integration tests'
   task :all do
     Rake::Task['test:unit'].invoke
@@ -61,11 +55,17 @@ namespace :test do
     t.ruby_opts = '-W0'
   end
 
-  namespace :platinum do
-    desc 'Run Platinum Rest API Spec tests'
-    RSpec::Core::RakeTask.new(:api) do
-      ENV['TEST_SUITE'] = 'platinum'
-      Rake::Task['test:rest_api'].invoke
+  # This is the task to run the Elasticsearch REST tests which we stopped using for 9.x.
+  # Use the environment variable TEST_SUITE to choose between 'free' and 'platinum' tests. For
+  # platinum, the test cluster needs to have the license activated and run with security enabled.
+  # For 'free', security must be disabled in the test cluster.
+  #
+  namespace :deprecated do
+    # TODO: TEST_SUITE
+    desc 'Run Elasticsearch test suite free tests.'
+    RSpec::Core::RakeTask.new(:rest_api) do |t|
+      test_dir = Rake.application.original_dir
+      t.pattern = "#{test_dir}/spec/rest_api/rest_api_yaml_spec.rb"
     end
   end
 end

elasticsearch-api/spec/rest_api/README.md

@@ -0,0 +1 @@
+This directory contains the files to run the Elasticsearch REST API Spec tests. See [../../api-spec-testing/README.md'](api-spec-testing).

rake_tasks/test_tasks.rake

@@ -47,33 +47,11 @@ namespace :test do
     end
   end
 
-  desc 'Run Elasticsearch test suite free tests.'
-  task es_free: ['es:wait_for_green'] do
-    puts '-' * 80
-    sh "cd #{CURRENT_PATH.join('elasticsearch-api')} && unset BUNDLE_GEMFILE && bundle exec rake test:rest_api"
-    puts "\n"
-  end
-
-  desc 'Run Elasticsearch test suite platinum tests.'
-  task es_platinum: 'es:wait_for_green' do
-    puts '-' * 80
-    sh "cd #{CURRENT_PATH.join('elasticsearch-api')} && unset BUNDLE_GEMFILE && TEST_SUITE=platinum bundle exec rake test:rest_api"
-    puts "\n"
-  end
-
   desc 'Run YAML test runner tests'
   task :yaml do
     sh "cd #{CURRENT_PATH.join('elasticsearch-api')} && unset BUNDLE_GEMFILE && bundle exec rake test:yaml"
   end
 
-  namespace :platinum do
-    desc 'Run platinum integration tests'
-    task :integration do
-      sh "cd #{CURRENT_PATH.join('elasticsearch-api')} && unset BUNDLE_GEMFILE && bundle exec rake test:platinum:integration"
-      puts "\n"
-    end
-  end
-
   # Returns: version_number, build_hash
   def cluster_info
     require 'elasticsearch'