From ee33ac43199e89a54bf5c91116e378f20091b2ca Mon Sep 17 00:00:00 2001 From: Katherine Griffin <42548585+kag728@users.noreply.github.com> Date: Fri, 5 Apr 2024 15:27:55 +0000 Subject: [PATCH] Upgrade CI from 8.7 to 8.13 --- .github/workflows/main.yml | 5 +---- README.md | 2 +- docker/compose.yaml | 8 ++++---- script/generate-rest-api-spec | 2 +- test/client/cluster_test.rb | 2 +- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 596101d8..ce0153b1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,14 +12,11 @@ jobs: strategy: matrix: ruby-version: ['3.2'] - ES_VERSION: ['5.6.15', '8.7.0', '8.13.0'] + ES_VERSION: ['5.6.15', '8.13.0'] include: - ES_VERSION: '5.6.15' ES_DOWNLOAD_URL: >- https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.15.tar.gz - - ES_VERSION: '8.7.0' - ES_DOWNLOAD_URL: >- - https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-8.7.0-linux-x86_64.tar.gz - ES_VERSION: '8.13.0' ES_DOWNLOAD_URL: >- https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-8.13.0-linux-x86_64.tar.gz diff --git a/README.md b/README.md index e20a17df..416ab9bc 100644 --- a/README.md +++ b/README.md @@ -110,7 +110,7 @@ end This client is tested against: - Ruby version 3.2 -- Elasticsearch versions 5.6, 8.7 and 8.13 +- Elasticsearch versions 5.6 and 8.13 ## Development diff --git a/docker/compose.yaml b/docker/compose.yaml index 97328fd6..aff0afe1 100644 --- a/docker/compose.yaml +++ b/docker/compose.yaml @@ -1,12 +1,12 @@ version: "3" services: - elasticsearch8.7: - image: docker.elastic.co/elasticsearch/elasticsearch:8.7.0 - container_name: es8.7 + elasticsearch8.13: + image: docker.elastic.co/elasticsearch/elasticsearch:8.13.0 + container_name: es8.13 profiles: ["es8", "all"] environment: - - cluster.name=elastomer8.7 + - cluster.name=elastomer8.13 - bootstrap.memory_lock=true - discovery.type=single-node - xpack.security.enabled=false diff --git a/script/generate-rest-api-spec b/script/generate-rest-api-spec index 1c613583..34cb828f 100755 --- a/script/generate-rest-api-spec +++ b/script/generate-rest-api-spec @@ -22,7 +22,7 @@ class RestApiSpecGenerator attr_reader :version, :short_version, :class_version - def initialize(version = "8.7") + def initialize(version = "8.13") @version = version sliced = @version.split(".").slice(0, 2) diff --git a/test/client/cluster_test.rb b/test/client/cluster_test.rb index c2b46b9c..bf471ed4 100644 --- a/test/client/cluster_test.rb +++ b/test/client/cluster_test.rb @@ -79,7 +79,7 @@ it "returns cluster stats" do h = @cluster.stats - expected = $client.version_support.es_version_8_plus? ? %w[cluster_name cluster_uuid indices nodes status timestamp] : %w[cluster_name indices nodes status timestamp] + expected = $client.version_support.es_version_8_plus? ? %w[cluster_name cluster_uuid indices nodes snapshots status timestamp] : %w[cluster_name indices nodes status timestamp] expected.unshift("_nodes") assert_equal expected, h.keys.sort