Skip to content

Commit 58f5e7c

Browse files
rishabh6788rishabh6788
authored
Force node-20 installation (#6120)
Signed-off-by: Rishabh Singh <sngri@amazon.com>
1 parent e8883e4 commit 58f5e7c

11 files changed

+91
-4
lines changed

‎jenkins/opensearch/benchmark-pull-request.jenkinsfile‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ pipeline {
4141
}
4242
environment {
4343
JOB_NAME = 'pull-request-benchmark-test'
44+
NODE_HOME = "${WORKSPACE}/node-20"
45+
PATH = "${WORKSPACE}/node-20/bin:${env.PATH}"
4446
}
4547
parameters {
4648
string(
@@ -229,6 +231,17 @@ pipeline {
229231
}
230232

231233
stages {
234+
stage('setup-node') {
235+
steps {
236+
sh '''
237+
curl -sL https://nodejs.org/dist/v20.18.0/node-v20.18.0-linux-x64.tar.xz | tar -xJ
238+
mv node-v20.18.0-linux-x64 node-20
239+
node --version
240+
npm install -g fs-extra@11.3.4 chalk@4.1.2 @aws-cdk/cloudformation-diff@2.182.0 aws-cdk@2.1118.0 cdk-assume-role-credential-plugin@1.4.0
241+
cdk --version
242+
'''
243+
}
244+
}
232245
stage('validate-and-set-parameters') {
233246
steps {
234247
script {

‎jenkins/opensearch/benchmark-test-vectorsearch.jenkinsfile‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ pipeline {
3030
AGENT_LABEL = 'Jenkins-Agent-AL2023-X64-M52xlarge-Vector-Benchmark-Test'
3131
BUNDLE_MANIFEST = 'bundle-manifest.yml'
3232
JOB_NAME = 'benchmark-test'
33+
NODE_HOME = "${WORKSPACE}/node-20"
34+
PATH = "${WORKSPACE}/node-20/bin:${env.PATH}"
3335
}
3436
triggers {
3537
parameterizedCron(
@@ -257,6 +259,17 @@ pipeline {
257259
}
258260

259261
stages {
262+
stage('setup-node') {
263+
agent { label AGENT_LABEL }
264+
steps {
265+
sh '''
266+
curl -sL https://nodejs.org/dist/v20.18.0/node-v20.18.0-linux-x64.tar.xz | tar -xJ
267+
mv node-v20.18.0-linux-x64 node-20
268+
node --version
269+
npm install -g fs-extra@11.3.4 chalk@4.1.2 @aws-cdk/cloudformation-diff@2.182.0 aws-cdk@2.1118.0 cdk-assume-role-credential-plugin@1.4.0
270+
'''
271+
}
272+
}
260273
stage('validate-and-set-parameters') {
261274
agent { label AGENT_LABEL }
262275
steps {

‎jenkins/opensearch/benchmark-test.jenkinsfile‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ pipeline {
3030
AGENT_LABEL = 'Jenkins-Agent-AL2023-X64-M52xlarge-Benchmark-Test'
3131
BUNDLE_MANIFEST = 'bundle-manifest.yml'
3232
JOB_NAME = 'benchmark-test'
33+
NODE_HOME = "${WORKSPACE}/node-20"
34+
PATH = "${WORKSPACE}/node-20/bin:${env.PATH}"
3335
}
3436
triggers {
3537
parameterizedCron(
@@ -297,6 +299,18 @@ pipeline {
297299
}
298300

299301
stages {
302+
stage('setup-node') {
303+
agent { label AGENT_LABEL }
304+
steps {
305+
sh '''
306+
curl -sL https://nodejs.org/dist/v20.18.0/node-v20.18.0-linux-x64.tar.xz | tar -xJ
307+
mv node-v20.18.0-linux-x64 node-20
308+
node --version
309+
npm install -g fs-extra@11.3.4 chalk@4.1.2 @aws-cdk/cloudformation-diff@2.182.0 aws-cdk@2.1118.0 cdk-assume-role-credential-plugin@1.4.0
310+
cdk --version
311+
'''
312+
}
313+
}
300314
stage('validate-and-set-parameters') {
301315
agent { label AGENT_LABEL }
302316
steps {

‎tests/jenkins/TestBenchmarkPullRequest.groovy‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,9 @@ class TestBenchmarkPullRequest extends BuildPipelineTest {
173173
binding.getVariable('currentBuild').rawBuild = [:]
174174
binding.getVariable('currentBuild').rawBuild.getCauses = { return "jenkins.branch.GenericCause@123abc" }
175175
helper.registerAllowedMethod('sh', [String.class], { String cmd ->
176-
updateBuildStatus('FAILURE')
176+
if (!cmd.contains('curl') && !cmd.contains('node --version') && !cmd.contains('npm install') && !cmd.contains('cdk --version')) {
177+
updateBuildStatus('FAILURE')
178+
}
177179
})
178180
def result = runScript("jenkins/opensearch/benchmark-pull-request.jenkinsfile")
179181

@@ -189,7 +191,9 @@ class TestBenchmarkPullRequest extends BuildPipelineTest {
189191
binding.getVariable('currentBuild').rawBuild.getCauses = { return "jenkins.branch.GenericCause@123abc" }
190192
helper.registerAllowedMethod("cfnDescribe", [Map.class]) { args -> return true}
191193
helper.registerAllowedMethod('sh', [String.class], { String cmd ->
192-
updateBuildStatus('ABORTED')
194+
if (!cmd.contains('curl') && !cmd.contains('node --version') && !cmd.contains('npm install') && !cmd.contains('cdk --version')) {
195+
updateBuildStatus('ABORTED')
196+
}
193197
})
194198
runScript("jenkins/opensearch/benchmark-pull-request.jenkinsfile")
195199

‎tests/jenkins/TestRunNonSecBenchmarkTestScript.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ class TestRunNonSecBenchmarkTestScript extends BuildPipelineTest{
123123
shCommand -> shCommand.contains('curl')
124124
}
125125

126-
assertThat(curlCommands.size(), equalTo(3))
126+
assertThat(curlCommands.size(), equalTo(4))
127127
assertThat(curlCommands, hasItem(
128128
"curl -sSL --retry 5 test://artifact.url --output tests/jenkins/data/opensearch-1.3.0-non-security-bundle.yml".toString()
129129
))

‎tests/jenkins/TestRunSecureBenchmarkTestScript.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class TestRunSecureBenchmarkTestScript extends BuildPipelineTest{
124124
shCommand -> shCommand.contains('curl')
125125
}
126126

127-
assertThat(curlCommands.size(), equalTo(4))
127+
assertThat(curlCommands.size(), equalTo(5))
128128
assertThat(curlCommands, hasItem(
129129
"curl -sSL --retry 5 test://artifact.url --output tests/jenkins/data/opensearch-1.3.0-bundle.yml".toString()
130130
))

‎tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-pull-request-generic.jenkinsfile.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,14 @@
2323

2424
H 16 * * * %DISTRIBUTION_URL=https://artifacts.opensearch.org/snapshots/core/opensearch/3.6.0-SNAPSHOT/opensearch-min-3.6.0-SNAPSHOT-linux-x64-latest.tar.gz;DISTRIBUTION_VERSION=3.6.0;TEST_WORKLOAD=clickbench;SINGLE_NODE_CLUSTER=true;USER_TAGS=cluster-config:x64-c5.2xlarge-3-shard-0-replica-snapshot-baseline;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo-3x","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"10.3.2","snapshot_name":"clickbench_3_shards","warmup_iterations":10,"test_iterations":20};MIN_DISTRIBUTION=true;TEST_PROCEDURE=dsl-clickbench-snapshot
2525
)
26+
benchmark-pull-request.stage(setup-node, groovy.lang.Closure)
27+
benchmark-pull-request.sh(
28+
curl -sL https://nodejs.org/dist/v20.18.0/node-v20.18.0-linux-x64.tar.xz | tar -xJ
29+
mv node-v20.18.0-linux-x64 node-20
30+
node --version
31+
npm install -g fs-extra@11.3.4 chalk@4.1.2 @aws-cdk/cloudformation-diff@2.182.0 aws-cdk@2.1118.0 cdk-assume-role-credential-plugin@1.4.0
32+
cdk --version
33+
)
2634
benchmark-pull-request.stage(validate-and-set-parameters, groovy.lang.Closure)
2735
benchmark-pull-request.script(groovy.lang.Closure)
2836
Messages.asBoolean()

‎tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-pull-request-user.jenkinsfile.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,14 @@
2323

2424
H 16 * * * %DISTRIBUTION_URL=https://artifacts.opensearch.org/snapshots/core/opensearch/3.6.0-SNAPSHOT/opensearch-min-3.6.0-SNAPSHOT-linux-x64-latest.tar.gz;DISTRIBUTION_VERSION=3.6.0;TEST_WORKLOAD=clickbench;SINGLE_NODE_CLUSTER=true;USER_TAGS=cluster-config:x64-c5.2xlarge-3-shard-0-replica-snapshot-baseline;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo-3x","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"10.3.2","snapshot_name":"clickbench_3_shards","warmup_iterations":10,"test_iterations":20};MIN_DISTRIBUTION=true;TEST_PROCEDURE=dsl-clickbench-snapshot
2525
)
26+
benchmark-pull-request.stage(setup-node, groovy.lang.Closure)
27+
benchmark-pull-request.sh(
28+
curl -sL https://nodejs.org/dist/v20.18.0/node-v20.18.0-linux-x64.tar.xz | tar -xJ
29+
mv node-v20.18.0-linux-x64 node-20
30+
node --version
31+
npm install -g fs-extra@11.3.4 chalk@4.1.2 @aws-cdk/cloudformation-diff@2.182.0 aws-cdk@2.1118.0 cdk-assume-role-credential-plugin@1.4.0
32+
cdk --version
33+
)
2634
benchmark-pull-request.stage(validate-and-set-parameters, groovy.lang.Closure)
2735
benchmark-pull-request.script(groovy.lang.Closure)
2836
Messages.asBoolean()

‎tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-test-distribution-url.jenkinsfile.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,15 @@
111111
H 12 * * * %DISTRIBUTION_URL=https://artifacts.opensearch.org/snapshots/core/opensearch/3.6.0-SNAPSHOT/opensearch-min-3.6.0-SNAPSHOT-linux-x64-latest.tar.gz;DISTRIBUTION_VERSION=3.6.0;TEST_WORKLOAD=clickbench;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=c5.2xlarge;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:c5.4xlarge,major-version:3x,cluster-config:x64-c5.2xlarge-3-data-3-shards-0-replica-snapshot-non-streaming-baseline;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo-3x","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"10.3.2","snapshot_name":"clickbench_3_shards","warmup_iterations":10,"test_iterations":20};CAPTURE_NODE_STAT=true;MIN_DISTRIBUTION=true;TELEMETRY_PARAMS={"node-stats-sample-interval":5};TEST_PROCEDURE=dsl-clickbench-streaming
112112

113113
)
114+
benchmark-test.stage(setup-node, groovy.lang.Closure)
115+
benchmark-test.echo(Executing on agent [label:Jenkins-Agent-AL2-X64-M52xlarge-Docker-Host-Benchmark-Test])
116+
benchmark-test.sh(
117+
curl -sL https://nodejs.org/dist/v20.18.0/node-v20.18.0-linux-x64.tar.xz | tar -xJ
118+
mv node-v20.18.0-linux-x64 node-20
119+
node --version
120+
npm install -g fs-extra@11.3.4 chalk@4.1.2 @aws-cdk/cloudformation-diff@2.182.0 aws-cdk@2.1118.0 cdk-assume-role-credential-plugin@1.4.0
121+
cdk --version
122+
)
114123
benchmark-test.stage(validate-and-set-parameters, groovy.lang.Closure)
115124
benchmark-test.echo(Executing on agent [label:Jenkins-Agent-AL2-X64-M52xlarge-Docker-Host-Benchmark-Test])
116125
benchmark-test.script(groovy.lang.Closure)

‎tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-test.jenkinsfile.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,15 @@
111111
H 12 * * * %DISTRIBUTION_URL=https://artifacts.opensearch.org/snapshots/core/opensearch/3.6.0-SNAPSHOT/opensearch-min-3.6.0-SNAPSHOT-linux-x64-latest.tar.gz;DISTRIBUTION_VERSION=3.6.0;TEST_WORKLOAD=clickbench;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=c5.2xlarge;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:c5.4xlarge,major-version:3x,cluster-config:x64-c5.2xlarge-3-data-3-shards-0-replica-snapshot-non-streaming-baseline;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo-3x","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"10.3.2","snapshot_name":"clickbench_3_shards","warmup_iterations":10,"test_iterations":20};CAPTURE_NODE_STAT=true;MIN_DISTRIBUTION=true;TELEMETRY_PARAMS={"node-stats-sample-interval":5};TEST_PROCEDURE=dsl-clickbench-streaming
112112

113113
)
114+
benchmark-test.stage(setup-node, groovy.lang.Closure)
115+
benchmark-test.echo(Executing on agent [label:Jenkins-Agent-AL2-X64-M52xlarge-Docker-Host-Benchmark-Test])
116+
benchmark-test.sh(
117+
curl -sL https://nodejs.org/dist/v20.18.0/node-v20.18.0-linux-x64.tar.xz | tar -xJ
118+
mv node-v20.18.0-linux-x64 node-20
119+
node --version
120+
npm install -g fs-extra@11.3.4 chalk@4.1.2 @aws-cdk/cloudformation-diff@2.182.0 aws-cdk@2.1118.0 cdk-assume-role-credential-plugin@1.4.0
121+
cdk --version
122+
)
114123
benchmark-test.stage(validate-and-set-parameters, groovy.lang.Closure)
115124
benchmark-test.echo(Executing on agent [label:Jenkins-Agent-AL2-X64-M52xlarge-Docker-Host-Benchmark-Test])
116125
benchmark-test.script(groovy.lang.Closure)

0 commit comments

Comments
 (0)
⚡