Skip to content

Commit 1aed0d7

Browse files
authored
[RORDEV-1857][RORDEV-1859] ES 9.2.1, 9.1.7, 8.19.7 support (#1180)
1 parent 34486bf commit 1aed0d7

File tree

7 files changed

+30
-7
lines changed

7 files changed

+30
-7
lines changed

azure-pipelines.yml

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,26 @@ pool:
4646

4747
stages:
4848

49+
- stage: ES_S3_UP
50+
displayName: 'Upload missing ROR ES dependencies'
51+
dependsOn: [ ]
52+
condition: and(succeeded(), ne(variables['Build.Reason'], 'Manual'))
53+
jobs:
54+
- job:
55+
steps:
56+
- script: |
57+
# Translate back env vars to avoid cyclical reference :/
58+
export aws_access_key_id=$var_aws_access_key_id
59+
export aws_secret_access_key=$var_aws_secret_access_key
60+
ci/upload_es_artifacts.sh
61+
continueOnError: true
62+
env:
63+
var_aws_access_key_id: $(aws_access_key_id)
64+
var_aws_secret_access_key: $(aws_secret_access_key)
65+
4966
- stage: OPTIONAL_CHECKS
5067
displayName: 'Optional checks'
51-
dependsOn: [ ]
68+
dependsOn: [ ES_S3_UP ]
5269
condition: and(succeeded(), ne(variables['Build.Reason'], 'Manual'))
5370
jobs:
5471
- job: CVE_CHECK
@@ -97,7 +114,7 @@ stages:
97114

98115
- stage: REQUIRED_CHECKS
99116
displayName: 'Required checks'
100-
dependsOn: [ ]
117+
dependsOn: [ ES_S3_UP ]
101118
condition: and(succeeded(), ne(variables['Build.Reason'], 'Manual'))
102119
jobs:
103120
- job:
@@ -121,7 +138,7 @@ stages:
121138

122139
- stage: TEST
123140
displayName: 'Run all tests'
124-
dependsOn: [ ]
141+
dependsOn: [ ES_S3_UP ]
125142
condition:
126143
and(
127144
succeeded(),

ci/supported-es-versions/es8x.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
8.19.7
12
8.19.6
23
8.19.5
34
8.19.4

ci/supported-es-versions/es9x.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
9.2.1
12
9.2.0
3+
9.1.7
24
9.1.6
35
9.1.5
46
9.1.4

ci/upload_es_artifacts.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ set -xe
44

55
echo ">>> ($0) UPLOADING ES ARTIFACTS ..."
66

7+
./gradlew --stacktrace --info clean ror-tools:uploadArtifactsFromEsBinaries -PesVersion=9.2.1
8+
./gradlew --stacktrace --info clean ror-tools:uploadArtifactsFromEsBinaries -PesVersion=9.1.7
79
#./gradlew --stacktrace --info clean ror-tools:uploadArtifactsFromEsBinaries -PesVersion=8.9.2
810
#./gradlew --stacktrace --info clean ror-tools:uploadArtifactsFromEsBinaries -PesVersion=8.9.1
911
#./gradlew --stacktrace --info clean ror-tools:uploadArtifactsFromEsBinaries -PesVersion=8.9.0

es818x/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
latestSupportedEsVersion=8.19.6
1+
latestSupportedEsVersion=8.19.7

es92x/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
latestSupportedEsVersion=9.2.0
1+
latestSupportedEsVersion=9.2.1

tests-utils/src/main/scala/tech/beshu/ror/utils/containers/windows/WindowsEsSetup.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,9 @@ object WindowsEsSetup extends LazyLogging {
6666
val destBetterFile = File(destination.toNIO)
6767
file.copyTo(destBetterFile, overwrite = true)
6868
case PluginInstallationStep.RunCommand(_, windowsCommand) =>
69-
logger.info(s"Step ${index + 1}/$numberOfSteps: run command $windowsCommand")
70-
os.proc("cmd", "/c", windowsCommand).call(
69+
val commandWithSanitizedPaths = windowsCommand.replace("\\", "/")
70+
logger.info(s"Step ${index + 1}/$numberOfSteps: run command $commandWithSanitizedPaths")
71+
os.proc("cmd", "/c", commandWithSanitizedPaths).call(
7172
cwd = esPath(elasticsearch.config.clusterName, elasticsearch.config.nodeName),
7273
stdout = os.ProcessOutput.Readlines(line => logger.info(s"[Step ${index + 1}/$numberOfSteps cmd] $line")),
7374
stderr = os.ProcessOutput.Readlines(line => logger.error(s"[Step ${index + 1}/$numberOfSteps cmd] $line")),

0 commit comments

Comments
 (0)