Remove node override for benchmark jobs. (#6121)

rishabh6788 · web-flow · commit 61163270c32f · 2026-04-14T13:58:04.000-04:00
Signed-off-by: Rishabh Singh &lt;sngri@amazon.com&gt;
diff --git a/jenkins/opensearch/benchmark-pull-request.jenkinsfile b/jenkins/opensearch/benchmark-pull-request.jenkinsfile
@@ -41,8 +41,6 @@ pipeline {
     }
     environment {
         JOB_NAME = 'pull-request-benchmark-test'
-        NODE_HOME = "${WORKSPACE}/node-20"
-        PATH = "${WORKSPACE}/node-20/bin:${env.PATH}"
     }
     parameters {
         string(
@@ -231,17 +229,6 @@ pipeline {
     }
 
     stages {
-        stage('setup-node') {
-            steps {
-                sh '''
-                    curl -sL https://nodejs.org/dist/v20.18.0/node-v20.18.0-linux-x64.tar.xz | tar -xJ
-                    mv node-v20.18.0-linux-x64 node-20
-                    node --version
-                    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
-                    cdk --version
-                '''
-            }
-        }
         stage('validate-and-set-parameters') {
             steps {
                 script {
diff --git a/jenkins/opensearch/benchmark-test-vectorsearch.jenkinsfile b/jenkins/opensearch/benchmark-test-vectorsearch.jenkinsfile
@@ -30,8 +30,6 @@ pipeline {
         AGENT_LABEL = 'Jenkins-Agent-AL2023-X64-M52xlarge-Vector-Benchmark-Test'
         BUNDLE_MANIFEST = 'bundle-manifest.yml'
         JOB_NAME = 'benchmark-test'
-        NODE_HOME = "${WORKSPACE}/node-20"
-        PATH = "${WORKSPACE}/node-20/bin:${env.PATH}"
     }
     triggers {
         parameterizedCron(
@@ -259,17 +257,6 @@ pipeline {
     }
 
     stages {
-        stage('setup-node') {
-            agent { label AGENT_LABEL }
-            steps {
-                sh '''
-                    curl -sL https://nodejs.org/dist/v20.18.0/node-v20.18.0-linux-x64.tar.xz | tar -xJ
-                    mv node-v20.18.0-linux-x64 node-20
-                    node --version
-                    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
-                '''
-            }
-        }
         stage('validate-and-set-parameters') {
             agent { label AGENT_LABEL }
             steps {
diff --git a/jenkins/opensearch/benchmark-test.jenkinsfile b/jenkins/opensearch/benchmark-test.jenkinsfile
@@ -30,8 +30,6 @@ pipeline {
         AGENT_LABEL = 'Jenkins-Agent-AL2023-X64-M52xlarge-Benchmark-Test'
         BUNDLE_MANIFEST = 'bundle-manifest.yml'
         JOB_NAME = 'benchmark-test'
-        NODE_HOME = "${WORKSPACE}/node-20"
-        PATH = "${WORKSPACE}/node-20/bin:${env.PATH}"
     }
     triggers {
         parameterizedCron(
@@ -299,18 +297,6 @@ pipeline {
     }
 
     stages {
-        stage('setup-node') {
-            agent { label AGENT_LABEL }
-            steps {
-                sh '''
-                    curl -sL https://nodejs.org/dist/v20.18.0/node-v20.18.0-linux-x64.tar.xz | tar -xJ
-                    mv node-v20.18.0-linux-x64 node-20
-                    node --version
-                    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
-                    cdk --version
-                '''
-            }
-        }
         stage('validate-and-set-parameters') {
             agent { label AGENT_LABEL }
             steps {
diff --git a/tests/jenkins/TestRunNonSecBenchmarkTestScript.groovy b/tests/jenkins/TestRunNonSecBenchmarkTestScript.groovy
@@ -123,7 +123,7 @@ class TestRunNonSecBenchmarkTestScript extends BuildPipelineTest{
             shCommand -> shCommand.contains('curl')
         }
 
-        assertThat(curlCommands.size(), equalTo(4))
+        assertThat(curlCommands.size(), equalTo(3))
         assertThat(curlCommands, hasItem(
                 "curl -sSL --retry 5 test://artifact.url --output tests/jenkins/data/opensearch-1.3.0-non-security-bundle.yml".toString()
         ))
diff --git a/tests/jenkins/TestRunSecureBenchmarkTestScript.groovy b/tests/jenkins/TestRunSecureBenchmarkTestScript.groovy
@@ -124,7 +124,7 @@ class TestRunSecureBenchmarkTestScript extends BuildPipelineTest{
             shCommand -> shCommand.contains('curl')
         }
 
-        assertThat(curlCommands.size(), equalTo(5))
+        assertThat(curlCommands.size(), equalTo(4))
         assertThat(curlCommands, hasItem(
                 "curl -sSL --retry 5 test://artifact.url --output tests/jenkins/data/opensearch-1.3.0-bundle.yml".toString()
         ))
diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-pull-request-generic.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-pull-request-generic.jenkinsfile.txt
@@ -23,14 +23,6 @@
 
                 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
             )
-         benchmark-pull-request.stage(setup-node, groovy.lang.Closure)
-            benchmark-pull-request.sh(
-                    curl -sL https://nodejs.org/dist/v20.18.0/node-v20.18.0-linux-x64.tar.xz | tar -xJ
-                    mv node-v20.18.0-linux-x64 node-20
-                    node --version
-                    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
-                    cdk --version
-                )
          benchmark-pull-request.stage(validate-and-set-parameters, groovy.lang.Closure)
             benchmark-pull-request.script(groovy.lang.Closure)
                Messages.asBoolean()
diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-pull-request-user.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-pull-request-user.jenkinsfile.txt
@@ -23,14 +23,6 @@
 
                 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
             )
-         benchmark-pull-request.stage(setup-node, groovy.lang.Closure)
-            benchmark-pull-request.sh(
-                    curl -sL https://nodejs.org/dist/v20.18.0/node-v20.18.0-linux-x64.tar.xz | tar -xJ
-                    mv node-v20.18.0-linux-x64 node-20
-                    node --version
-                    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
-                    cdk --version
-                )
          benchmark-pull-request.stage(validate-and-set-parameters, groovy.lang.Closure)
             benchmark-pull-request.script(groovy.lang.Closure)
                Messages.asBoolean()
diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-test-distribution-url.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-test-distribution-url.jenkinsfile.txt
@@ -111,15 +111,6 @@
         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
 
         )
-         benchmark-test.stage(setup-node, groovy.lang.Closure)
-            benchmark-test.echo(Executing on agent [label:Jenkins-Agent-AL2-X64-M52xlarge-Docker-Host-Benchmark-Test])
-            benchmark-test.sh(
-                    curl -sL https://nodejs.org/dist/v20.18.0/node-v20.18.0-linux-x64.tar.xz | tar -xJ
-                    mv node-v20.18.0-linux-x64 node-20
-                    node --version
-                    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
-                    cdk --version
-                )
          benchmark-test.stage(validate-and-set-parameters, groovy.lang.Closure)
             benchmark-test.echo(Executing on agent [label:Jenkins-Agent-AL2-X64-M52xlarge-Docker-Host-Benchmark-Test])
             benchmark-test.script(groovy.lang.Closure)
diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-test.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-test.jenkinsfile.txt
@@ -111,15 +111,6 @@
         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
 
         )
-         benchmark-test.stage(setup-node, groovy.lang.Closure)
-            benchmark-test.echo(Executing on agent [label:Jenkins-Agent-AL2-X64-M52xlarge-Docker-Host-Benchmark-Test])
-            benchmark-test.sh(
-                    curl -sL https://nodejs.org/dist/v20.18.0/node-v20.18.0-linux-x64.tar.xz | tar -xJ
-                    mv node-v20.18.0-linux-x64 node-20
-                    node --version
-                    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
-                    cdk --version
-                )
          benchmark-test.stage(validate-and-set-parameters, groovy.lang.Closure)
             benchmark-test.echo(Executing on agent [label:Jenkins-Agent-AL2-X64-M52xlarge-Docker-Host-Benchmark-Test])
             benchmark-test.script(groovy.lang.Closure)
diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/secure-benchmark-test.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/secure-benchmark-test.jenkinsfile.txt
@@ -111,15 +111,6 @@
         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
 
         )
-         benchmark-test.stage(setup-node, groovy.lang.Closure)
-            benchmark-test.echo(Executing on agent [label:Jenkins-Agent-AL2-X64-M52xlarge-Docker-Host-Benchmark-Test])
-            benchmark-test.sh(
-                    curl -sL https://nodejs.org/dist/v20.18.0/node-v20.18.0-linux-x64.tar.xz | tar -xJ
-                    mv node-v20.18.0-linux-x64 node-20
-                    node --version
-                    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
-                    cdk --version
-                )
          benchmark-test.stage(validate-and-set-parameters, groovy.lang.Closure)
             benchmark-test.echo(Executing on agent [label:Jenkins-Agent-AL2-X64-M52xlarge-Docker-Host-Benchmark-Test])
             benchmark-test.script(groovy.lang.Closure)

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ class TestRunNonSecBenchmarkTestScript extends BuildPipelineTest{`
`123`	`123`	`shCommand -> shCommand.contains('curl')`
`124`	`124`	`}`
`125`	`125`
`126`		`- assertThat(curlCommands.size(), equalTo(4))`
	`126`	`+ assertThat(curlCommands.size(), equalTo(3))`
`127`	`127`	`assertThat(curlCommands, hasItem(`
`128`	`128`	`"curl -sSL --retry 5 test://artifact.url --output tests/jenkins/data/opensearch-1.3.0-non-security-bundle.yml".toString()`
`129`	`129`	`))`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ class TestRunSecureBenchmarkTestScript extends BuildPipelineTest{`
`124`	`124`	`shCommand -> shCommand.contains('curl')`
`125`	`125`	`}`
`126`	`126`
`127`		`- assertThat(curlCommands.size(), equalTo(5))`
	`127`	`+ assertThat(curlCommands.size(), equalTo(4))`
`128`	`128`	`assertThat(curlCommands, hasItem(`
`129`	`129`	`"curl -sSL --retry 5 test://artifact.url --output tests/jenkins/data/opensearch-1.3.0-bundle.yml".toString()`
`130`	`130`	`))`