From 3e58ac0e7b15df26345ff6b852f72c5da2947a9f Mon Sep 17 00:00:00 2001 From: Joseph Soto Date: Tue, 19 Nov 2024 16:36:57 -0700 Subject: [PATCH] [scripts] change default Elasticsearch test version to es 7.9.3 (#3833) This PR makes the following changes: ## Scripts - Changes the default Elasticsearch version from `6.8.6` to `7.9.3` - This resolves an issue of incompatibility of ARM users and the Elasticsearch `6.8.6` image - Bumped **@terascope/scripts** from version `1.5.0` to `1.5.1` Ref to issue #3807 --- e2e/package.json | 2 +- packages/elasticsearch-api/package.json | 2 +- packages/elasticsearch-store/package.json | 2 +- packages/scripts/package.json | 2 +- packages/scripts/src/helpers/config.ts | 2 +- packages/teraslice/package.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/e2e/package.json b/e2e/package.json index 0f48ebbf95d..cb21bca66ca 100644 --- a/e2e/package.json +++ b/e2e/package.json @@ -29,7 +29,7 @@ "setup": "yarn --silent", "test": "TEST_ELASTICSEARCH='true' TEST_KAFKA='true' ts-scripts test --suite e2e --", "test:debug": "TEST_ELASTICSEARCH='true' TEST_KAFKA='true' ts-scripts test --suite e2e --debug --", - "test:elasticsearch6": "TEST_ELASTICSEARCH='true' TEST_KAFKA='true' ts-scripts test --suite e2e --", + "test:elasticsearch6": "TEST_ELASTICSEARCH='true' ELASTICSEARCH_VERSION='6.8.6' TEST_KAFKA='true' ts-scripts test --suite e2e --", "test:elasticsearch7": "TEST_ELASTICSEARCH='true' ELASTICSEARCH_VERSION='7.9.3' TEST_KAFKA='true' ts-scripts test --suite e2e --", "test:k8s": "TEST_ELASTICSEARCH='true' ELASTICSEARCH_VERSION='7.9.3' TEST_KAFKA='true' TEST_PLATFORM='kubernetes' ts-scripts test --suite e2e --", "test:k8sNoBuild": "SKIP_DOCKER_BUILD_IN_E2E='true' TEST_ELASTICSEARCH='true' ELASTICSEARCH_VERSION='7.9.3' TEST_KAFKA='true' TEST_PLATFORM='kubernetes' ts-scripts test --suite e2e --", diff --git a/packages/elasticsearch-api/package.json b/packages/elasticsearch-api/package.json index 5bdadc38ed7..bb3aa907ee5 100644 --- a/packages/elasticsearch-api/package.json +++ b/packages/elasticsearch-api/package.json @@ -16,7 +16,7 @@ "scripts": { "test": "TEST_RESTRAINED_ELASTICSEARCH='true' ts-scripts test . --", "test:debug": "TEST_RESTRAINED_ELASTICSEARCH='true' ts-scripts test --debug . --", - "test:elasticsearch6": "TEST_RESTRAINED_ELASTICSEARCH='true' ts-scripts test . --", + "test:elasticsearch6": "TEST_RESTRAINED_ELASTICSEARCH='true' ELASTICSEARCH_VERSION='6.8.6' ts-scripts test . --", "test:elasticsearch7": "TEST_RESTRAINED_ELASTICSEARCH='true' ELASTICSEARCH_VERSION='7.9.3' ts-scripts test . --", "test:elasticsearch8": "TEST_RESTRAINED_ELASTICSEARCH='true' ELASTICSEARCH_VERSION='8.1.2' ts-scripts test . --", "test:opensearch1": "TEST_RESTRAINED_OPENSEARCH='true' ts-scripts test --debug . --", diff --git a/packages/elasticsearch-store/package.json b/packages/elasticsearch-store/package.json index 7c6e004771b..eca1fe4fc64 100644 --- a/packages/elasticsearch-store/package.json +++ b/packages/elasticsearch-store/package.json @@ -22,7 +22,7 @@ "build:watch": "yarn build --watch", "test": "TEST_ELASTICSEARCH='true' ts-scripts test . --", "test:debug": "TEST_ELASTICSEARCH='true' ts-scripts test --debug . --", - "test:elasticsearch6": "TEST_ELASTICSEARCH='true' ts-scripts test . --", + "test:elasticsearch6": "TEST_ELASTICSEARCH='true' ELASTICSEARCH_VERSION='6.8.6' ts-scripts test . --", "test:elasticsearch7": "TEST_ELASTICSEARCH='true' ELASTICSEARCH_VERSION='7.9.3' ts-scripts test . --", "test:elasticsearch8": "TEST_ELASTICSEARCH='true' ELASTICSEARCH_VERSION='8.1.2' ts-scripts test . --", "test:opensearch1": "TEST_OPENSEARCH='true' ts-scripts test . --", diff --git a/packages/scripts/package.json b/packages/scripts/package.json index 021dc2c5ce4..60000479cd9 100644 --- a/packages/scripts/package.json +++ b/packages/scripts/package.json @@ -1,7 +1,7 @@ { "name": "@terascope/scripts", "displayName": "Scripts", - "version": "1.5.0", + "version": "1.5.1", "description": "A collection of terascope monorepo scripts", "homepage": "https://github.com/terascope/teraslice/tree/master/packages/scripts#readme", "bugs": { diff --git a/packages/scripts/src/helpers/config.ts b/packages/scripts/src/helpers/config.ts index a1250e87413..df35f1a86cb 100644 --- a/packages/scripts/src/helpers/config.ts +++ b/packages/scripts/src/helpers/config.ts @@ -36,7 +36,7 @@ export const ELASTICSEARCH_HOSTNAME = process.env.ELASTICSEARCH_HOSTNAME || HOST export const ELASTICSEARCH_PORT = process.env.ELASTICSEARCH_PORT || '49200'; export const ELASTICSEARCH_HOST = `http://${ELASTICSEARCH_HOSTNAME}:${ELASTICSEARCH_PORT}`; export const ELASTICSEARCH_VERSION = process.env.ELASTICSEARCH_VERSION - || __DEFAULT_ELASTICSEARCH6_VERSION; + || __DEFAULT_ELASTICSEARCH7_VERSION; export const ELASTICSEARCH_DOCKER_IMAGE = process.env.ELASTICSEARCH_DOCKER_IMAGE || 'elasticsearch'; export const RESTRAINED_ELASTICSEARCH_PORT = process.env.RESTRAINED_ELASTICSEARCH_PORT || '49202'; diff --git a/packages/teraslice/package.json b/packages/teraslice/package.json index a4de2743593..c947b4075dd 100644 --- a/packages/teraslice/package.json +++ b/packages/teraslice/package.json @@ -27,7 +27,7 @@ "start": "node service.js", "test": "TEST_ELASTICSEARCH='true' ts-scripts test . --", "test:debug": "TEST_ELASTICSEARCH='true' ts-scripts test --debug . --", - "test:elasticsearch6": "TEST_ELASTICSEARCH='true' ts-scripts test . --", + "test:elasticsearch6": "TEST_ELASTICSEARCH='true' ELASTICSEARCH_VERSION='6.8.6' ts-scripts test . --", "test:elasticsearch7": "TEST_ELASTICSEARCH='true' ELASTICSEARCH_VERSION='7.9.3' ts-scripts test . --", "test:opensearch1": "TEST_OPENSEARCH='true' ts-scripts test . --", "test:opensearch2": "TEST_OPENSEARCH='true' OPENSEARCH_VERSION='2.8.0' ts-scripts test . --",