Skip to content

[CI] Update 8.17 #2562

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jan 17, 2025
Merged

[CI] Update 8.17 #2562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7e0357
[CI] Fixes rake task for automated matrix version bumping
picandocodigo Jan 17, 2025
091bf54
[CI] Bumps stack version to 8.17.1-SNAPSHOT in test matrices
picandocodigo Jan 17, 2025
e13460d
[Gem] Lock concurrent-ruby for JRuby 9.3
picandocodigo Jan 16, 2025
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
4 changes: 2 additions & 2 deletions .buildkite/pipeline.yml
View file
Open in desktop
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.17.0-SNAPSHOT
STACK_VERSION: 8.17.1-SNAPSHOT
TRANSPORT_VERSION: "{{ matrix.transport }}"
RUBY_SOURCE: "{{ matrix.ruby_source }}"
QUIET: false
Expand Down Expand Up @@ -62,7 +62,7 @@ steps:
provider: "gcp"
env:
RUBY_VERSION: "3.3"
STACK_VERSION: 8.17.0-SNAPSHOT
STACK_VERSION: 8.17.1-SNAPSHOT
ES_YAML_TESTS_BRANCH: 8.17
TRANSPORT_VERSION: "8.3"
RUBY_SOURCE: "ruby"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/8.17.yml
View file
Open in desktop
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.17.0-SNAPSHOT
stack-version: 8.17.1-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.17.0-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit
run: rake es:download_artifacts[8.17.1-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit
4 changes: 2 additions & 2 deletions .github/workflows/otel.yml
View file
Open in desktop
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.17.0-SNAPSHOT
stack-version: 8.17.1-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.17.0-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit
run: rake es:download_artifacts[8.17.1-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit
3 changes: 2 additions & 1 deletion elasticsearch-api/elasticsearch-api.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Gem::Specification.new do |s|
s.add_development_dependency 'ansi'
s.add_development_dependency 'bundler'
s.add_development_dependency 'elasticsearch'
s.add_development_dependency 'elasticsearch-test-runner' unless defined?(JRUBY_VERSION) && JRUBY_VERSION <= "9.4"
s.add_development_dependency 'elasticsearch-test-runner' unless defined?(JRUBY_VERSION) && JRUBY_VERSION <= '9.4'
s.add_development_dependency 'minitest'
s.add_development_dependency 'minitest-reporters', '>= 1.6'
s.add_development_dependency 'mocha'
Expand All @@ -59,6 +59,7 @@ Gem::Specification.new do |s|
s.add_development_dependency 'yard'

# Gems for testing integrations
s.add_development_dependency 'concurrent-ruby', '1.3.4' if defined? JRUBY_VERSION && JRUBY_VERSION < '9.4'
s.add_development_dependency 'jsonify'
s.add_development_dependency 'hashie'
# Temporary support for Ruby 2.6, since it's EOL March 2022:
Expand Down
4 changes: 2 additions & 2 deletions rake_tasks/automation.rake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ namespace :automation do
if file == '.buildkite/pipeline.yml'
require 'yaml'
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']
branch = version.match(/([0-9]+\.[0-9]+)\.[0-9]+.*/)[1].to_s
yaml_tests_branch = yaml['steps'][1]['env']['ES_YAML_TESTS_BRANCH'].to_s
unless ['main', '8.x'].include? yaml_tests_branch
content.gsub!(yaml_tests_branch, branch)
puts "[#{yaml_tests_branch}] -> [#{branch}] in #{file.gsub('./', '')}"
Expand Down
Loading