Harden CI and test helpers for ES version portability

Preparing for Elasticsearch 9.x support exposed several areas where
the test infrastructure was tightly coupled to a specific ES version
or relied on brittle assumptions.

- Promote Elasticsearch to a proper GH Actions service with a
  built-in health check using the native wait_for_status=yellow
  parameter, replacing the fragile `sleep 15` / shell-loop approach.
  GH Actions won't start steps until all services are healthy.
- Switch Docker image to docker.elastic.co registry and parameterize
  the version via ES_VERSION env var. Docker Hub stopped reliably
  publishing ES images after 8.x; the official Elastic registry is
  the recommended source going forward.
- Rename job from `ruby-3` to `test` — the old name was misleading
  now that Ruby 4.0 is in the matrix.
- Add job-level timeout-minutes (15 for tests, 10 for rubocop) to
  prevent stuck runs from burning runner minutes until the 6-hour
  GH default.
- Add concurrency group to cancel in-progress CI runs when a PR is
  updated, avoiding redundant work on rapid pushes.
- Switch rubocop output from `--format simple` to `--format github`
  so offenses appear as inline annotations on PR diffs.
- Fix drop_indices to use `format: 'json'` instead of parsing the
  text-format cat.indices response by column position. The column
  order is not guaranteed across ES versions, making the previous
  approach fragile for any future upgrade.
- Add canary specs that verify Elastic::Transport error hierarchy,
  Elasticsearch::API.serializer, and Client constructor remain
  compatible. These act as early-warning tripwires — if a future
  ES client upgrade silently changes these APIs, these specs will
  fail with a clear message rather than causing subtle runtime bugs.

Author: mattmenefee

.github/workflows/ruby.yml

@@ -11,9 +11,14 @@ on:
       reopened # PR was reopened
     ]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
-  ruby-3:
+  test:
     runs-on: ubuntu-latest
+    timeout-minutes: 15
     strategy:
       fail-fast: false
       matrix:
@@ -32,30 +37,41 @@ jobs:
           - '6379:6379'
         # Set health checks to wait until redis has started
         options: >-
-          --health-cmd "redis-cli ping"
+          --health-cmd 'redis-cli ping'
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
+      elasticsearch:
+        image: docker.elastic.co/elasticsearch/elasticsearch:8.15.0
+        ports:
+          - '9250:9200'
+        env:
+          discovery.type: single-node
+          xpack.security.enabled: 'false'
+          ES_JAVA_OPTS: '-Xms500m -Xmx500m'
+        # Set health checks to wait until Elasticsearch has started
+        options: >-
+          --health-cmd 'curl -sf http://localhost:9200/_cluster/health?wait_for_status=yellow&timeout=5s'
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 10
+
     steps:
       - uses: actions/checkout@v6
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
-      - name: Start containers
-        run: |
-          docker compose up elasticsearch_test -d
-          sleep 15
-
       - name: Tests
         run: bundle exec rspec
 
   rubocop:
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v6
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 3.4
           bundler-cache: true
-      - run: bundle exec rubocop --format simple
+      - run: bundle exec rubocop --format github

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 8.0.2 (unreleased)
+
+### Changes
+
+* [#1008](https://github.com/toptal/chewy/pull/1008): Harden CI and test helpers for ES version portability. ([@mattmenefee][])
+
 ## 8.0.1 (2026-03-12)
 
 ### New Features
@@ -874,6 +880,7 @@
 [@marshall]: https://github.com/marshall
 [@matchbookmac]: https://github.com/matchbookmac
 [@matthee]: https://github.com/matthee
+[@mattmenefee]: https://github.com/mattmenefee
 [@mattzollinhofer]: https://github.com/mattzollinhofer
 [@menglewis]: https://github.com/menglewis
 [@mikeyhogarth]: https://github.com/mikeyhogarth

docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   elasticsearch_test:
-    image: "elasticsearch:8.15.0"
+    image: "docker.elastic.co/elasticsearch/elasticsearch:${ES_VERSION:-8.15.0}"
     environment:
       - bootstrap.memory_lock=${ES_MEMORY_LOCK:-false}
       - "ES_JAVA_OPTS=-Xms${TEST_ES_HEAP_SIZE:-500m} -Xmx${TEST_ES_HEAP_SIZE:-500m}"

spec/chewy/elasticsearch_compatibility_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe 'Elasticsearch compatibility' do
+  describe 'Elastic::Transport error hierarchy' do
+    specify 'NotFound is defined' do
+      expect(Elastic::Transport::Transport::Errors::NotFound).to be < StandardError
+    end
+
+    specify 'BadRequest is defined' do
+      expect(Elastic::Transport::Transport::Errors::BadRequest).to be < StandardError
+    end
+  end
+
+  describe 'Elasticsearch::API.serializer' do
+    specify 'responds to dump' do
+      expect(Elasticsearch::API.serializer).to respond_to(:dump)
+    end
+  end
+
+  describe 'Elasticsearch::Client constructor' do
+    specify 'accepts host configuration' do
+      client = Elasticsearch::Client.new(host: 'localhost:9200')
+      expect(client).to be_a(Elasticsearch::Client)
+    end
+  end
+end

spec/spec_helper.rb

@@ -45,8 +45,8 @@
 
 # Low-level substitute for now-obsolete drop_indices
 def drop_indices
-  response = Chewy.client.cat.indices
-  indices = response.body.lines.map { |line| line.split[2] }
+  response = Chewy.client.cat.indices(format: 'json')
+  indices = response.body.map { |entry| entry['index'] }
   return if indices.blank?
 
   Chewy.client.indices.delete(index: indices)