Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump 8.x #2506

Open
wants to merge 5 commits into
base: 8.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ steps:
env:
RUBY_VERSION: "{{ matrix.ruby }}"
TEST_SUITE: "{{ matrix.suite }}"
STACK_VERSION: 8.16.0-SNAPSHOT
STACK_VERSION: 8.17.0-SNAPSHOT
TRANSPORT_VERSION: "{{ matrix.transport }}"
RUBY_SOURCE: "{{ matrix.ruby_source }}"
QUIET: false
Expand Down Expand Up @@ -67,8 +67,8 @@ steps:
provider: "gcp"
env:
RUBY_VERSION: "3.3"
STACK_VERSION: 8.16.0-SNAPSHOT
ES_YAML_TESTS_BRANCH: main
STACK_VERSION: 8.17.0-SNAPSHOT
ES_YAML_TESTS_BRANCH: 8.x
TRANSPORT_VERSION: "8.3"
RUBY_SOURCE: "ruby"
TEST_SUITE: "platinum"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/8.x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
sudo sysctl -w vm.max_map_count=262144
- uses: elastic/elastic-github-actions/elasticsearch@master
with:
stack-version: 8.16.0-SNAPSHOT
stack-version: 8.17.0-SNAPSHOT
security-enabled: false
- uses: ruby/setup-ruby@v1
with:
Expand All @@ -40,4 +40,4 @@ jobs:
- name: elasticsearch
run: cd elasticsearch && bundle exec rake test:all
- name: elasticsearch-api
run: rake es:download_artifacts[8.16.0-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit
run: rake es:download_artifacts[8.17.0-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit
4 changes: 2 additions & 2 deletions .github/workflows/otel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
sudo sysctl -w vm.max_map_count=262144
- uses: elastic/elastic-github-actions/elasticsearch@master
with:
stack-version: 8.16.0-SNAPSHOT
stack-version: 8.17.0-SNAPSHOT
security-enabled: false
- uses: ruby/setup-ruby@v1
with:
Expand All @@ -42,4 +42,4 @@ jobs:
- name: elasticsearch
run: cd elasticsearch && bundle exec rake test:all
- name: elasticsearch-api
run: rake es:download_artifacts[8.16.0-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit
run: rake es:download_artifacts[8.17.0-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit
14 changes: 11 additions & 3 deletions elasticsearch-api/api-spec-testing/rspec_matchers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@

failure_message do |response|
"the expected response pair/value(s) #{@mismatched_pairs}" +
" does not match the pair/value(s) in the response #{response}"
" does not match the pair/value(s) in the response #{response}"
end

def sanitize_pairs(expected_pairs)
Expand Down Expand Up @@ -235,8 +235,14 @@ def compare_hash(expected_pairs, actual_hash, test)
when Hash
compare_hash(expected_value, actual_value, test)
when Array
unless compare_array(expected_value, actual_value, test, actual_hash)
@mismatched_pairs.merge!(expected_key => expected_value)
begin
unless compare_array(expected_value.sort, actual_value.sort, test, actual_hash)
@mismatched_pairs.merge!(expected_key => expected_value)
end
rescue TypeError, ArgumentError
unless compare_array(expected_value, actual_value, test, actual_hash)
@mismatched_pairs.merge!(expected_key => expected_value)
end
end
when String
unless compare_string(expected_value, actual_value, test, actual_hash)
Expand Down Expand Up @@ -283,6 +289,8 @@ def compare_array(expected, actual, test, response)
return false unless compare_array(value, actual[i], test, response)
when String
return false unless compare_string(value, actual[i], test, response)
else
true
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion elasticsearch-api/lib/elasticsearch/api/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@

module Elasticsearch
module API
VERSION = '8.16.0'.freeze
VERSION = '8.17.0'.freeze
end
end
48 changes: 48 additions & 0 deletions elasticsearch-api/spec/rest_api/skipped_tests_free.yml
Original file line number Diff line number Diff line change
Expand Up @@ -162,3 +162,51 @@
-
:file: 'ingest_geoip/60_ip_location_databases.yml'
:description: '*'
-
:file: 'index/91_metrics_no_subobjects.yml'
:description: 'Metrics object indexing with synthetic source'
-
:file: 'indices.create/20_synthetic_source.yml'
:description: '*'
-
:file: 'indices.create/21_synthetic_source_stored.yml'
:description: '*'
-
:file: 'indices.put_mapping/10_basic.yml'
:description: 'disabling synthetic source fails'
-
:file: 'logsdb/20_source_mapping.yml'
:description: 'synthetic _source is default'
-
:file: 'index/92_metrics_auto_subobjects.yml'
:description: 'Metrics object indexing with synthetic source'
-
:file: 'tsdb/20_mapping.yml'
:description: 'Synthetic source'
-
:file: 'search.highlight/50_synthetic_source.yml'
:description: 'text multi fvh source order'
-
:file: 'search.highlight/50_synthetic_source.yml'
:description: 'text multi fvh score order'
-
:file: 'update/100_synthetic_source.yml'
:description: 'stored text'
-
:file: 'get/100_synthetic_source.yml'
:description: 'fetch without refresh also produces synthetic source'
-
:file: 'update/100_synthetic_source.yml'
:description: 'stored text'
-
:file: 'update/100_synthetic_source.yml'
:description: 'keyword'
-
:file: 'update/100_synthetic_source.yml'
:description: 'fetch without refresh also produces synthetic source'
-
:file: 'get/100_synthetic_source.yml'
:description: 'flattened field'
-
:file: 'range/20_synthetic_source.yml'
:description: '*'
3 changes: 3 additions & 0 deletions elasticsearch-api/spec/rest_api/skipped_tests_platinum.yml
Original file line number Diff line number Diff line change
Expand Up @@ -214,3 +214,6 @@
-
:file: 'esql/180_match_operator.yml'
:description: '*'
-
:file: 'esql/60_usage.yml'
:description: 'Basic ESQL usage output (telemetry) non-snapshot version'
2 changes: 1 addition & 1 deletion elasticsearch/elasticsearch.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Gem::Specification.new do |s|
s.required_ruby_version = '>= 2.5'

s.add_dependency 'elastic-transport', '~> 8.3'
s.add_dependency 'elasticsearch-api', '8.16.0'
s.add_dependency 'elasticsearch-api', '8.17.0'

s.add_development_dependency 'base64'
s.add_development_dependency 'bundler'
Expand Down
2 changes: 1 addition & 1 deletion elasticsearch/lib/elasticsearch/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
# under the License.

module Elasticsearch
VERSION = '8.16.0'.freeze
VERSION = '8.17.0'.freeze
end
9 changes: 4 additions & 5 deletions rake_tasks/automation.rake
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ namespace :automation do
task :bumpmatrix, :version do |_, args|
abort('[!] Required argument [version] missing') unless (version = args[:version])
gh_actions = Dir.glob(File.expand_path('../.github/workflows/*.yml', __dir__))

files = gh_actions + ['.buildkite/pipeline.yml']
regexp = Regexp.new(/([0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,2}?+(-SNAPSHOT)?)/)
files.each do |file|
Expand All @@ -108,10 +107,10 @@ namespace :automation do
yaml = YAML.safe_load(content)
branch = version.match(/([0-9]+\.[0-9]+)\.[0-9]+.*/)[1]
yaml_tests_branch = yaml['steps'][1]['env']['ES_YAML_TESTS_BRANCH']
next if yaml_tests_branch == 'main'

content.gsub!(yaml_tests_branch, branch)
puts "[#{yaml_tests_branch}] -> [#{branch}] in #{file.gsub('./', '')}"
unless ['main', '8.x'].include? yaml_tests_branch
content.gsub!(yaml_tests_branch, branch)
puts "[#{yaml_tests_branch}] -> [#{branch}] in #{file.gsub('./', '')}"
end
end
match = content.match(regexp)
next if match.nil?
Expand Down