From faceb52e7c5413e51d1300eb5699b769ff3bcb73 Mon Sep 17 00:00:00 2001 From: Tianle Huang Date: Fri, 22 Apr 2022 04:25:09 +0000 Subject: [PATCH 1/3] pass test run id when running tests from Jenkins Signed-off-by: Tianle Huang --- vars/runBwcTestScript.groovy | 1 + vars/runIntegTestScript.groovy | 1 + vars/runPerfTestScript.groovy | 1 + 3 files changed, 3 insertions(+) diff --git a/vars/runBwcTestScript.groovy b/vars/runBwcTestScript.groovy index 41f09623c3..cf1ce29e7e 100644 --- a/vars/runBwcTestScript.groovy +++ b/vars/runBwcTestScript.groovy @@ -12,6 +12,7 @@ void call(Map args = [:]) { './test.sh', 'bwc-test', "${args.testManifest}", + '--test-run-id 1', "--paths ${paths}", ].join(' ')) } diff --git a/vars/runIntegTestScript.groovy b/vars/runIntegTestScript.groovy index 5b64adf1b6..55946aed5e 100644 --- a/vars/runIntegTestScript.groovy +++ b/vars/runIntegTestScript.groovy @@ -12,6 +12,7 @@ void call(Map args = [:]) { './test.sh', 'integ-test', "${args.testManifest}", + '--test-run-id 1', "--paths ${paths}", ].join(' ')) } diff --git a/vars/runPerfTestScript.groovy b/vars/runPerfTestScript.groovy index bec1267c2c..4bf299bb8d 100644 --- a/vars/runPerfTestScript.groovy +++ b/vars/runPerfTestScript.groovy @@ -15,6 +15,7 @@ void call(Map args = [:]) { "--stack test-single-security-${args.buildId}-${args.architecture}", "--bundle-manifest ${args.bundleManifest}", "--config config.yml", + '--test-run-id 1', args.insecure ? "--without-security" : "", isNullOrEmpty(args.workload) ? "" : "--workload ${args.workload}", isNullOrEmpty(args.testIterations) ? "" : "--test-iters ${args.testIterations}", From 8bf6300a1f5874265d461f71e8ab145acfc894ec Mon Sep 17 00:00:00 2001 From: Tianle Huang Date: Fri, 22 Apr 2022 04:32:48 +0000 Subject: [PATCH 2/3] do not touch perf test Signed-off-by: Tianle Huang --- vars/runPerfTestScript.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/vars/runPerfTestScript.groovy b/vars/runPerfTestScript.groovy index 4bf299bb8d..bec1267c2c 100644 --- a/vars/runPerfTestScript.groovy +++ b/vars/runPerfTestScript.groovy @@ -15,7 +15,6 @@ void call(Map args = [:]) { "--stack test-single-security-${args.buildId}-${args.architecture}", "--bundle-manifest ${args.bundleManifest}", "--config config.yml", - '--test-run-id 1', args.insecure ? "--without-security" : "", isNullOrEmpty(args.workload) ? "" : "--workload ${args.workload}", isNullOrEmpty(args.testIterations) ? "" : "--test-iters ${args.testIterations}", From 8741b7cea218dab91326cf85518f08faa37e836e Mon Sep 17 00:00:00 2001 From: Tianle Huang Date: Fri, 22 Apr 2022 04:56:18 +0000 Subject: [PATCH 3/3] fix unit tests Signed-off-by: Tianle Huang --- .../opensearch-dashboards/bwc-test.jenkinsfile.txt | 2 +- .../opensearch-dashboards/integ-test.jenkinsfile.txt | 2 +- .../opensearch/bwc-test.jenkinsfile.txt | 2 +- .../opensearch/integ-test.jenkinsfile.txt | 2 +- tests/jenkins/jobs/RunBwcTestScript_Jenkinsfile.txt | 2 +- .../jobs/RunBwcTestScript_OpenSearch_Dashboards_Jenkinsfile.txt | 2 +- tests/jenkins/jobs/RunIntegTestScript_Jenkinsfile.txt | 2 +- .../RunIntegTestScript_OpenSearch_Dashboards_Jenkinsfile.txt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/bwc-test.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/bwc-test.jenkinsfile.txt index d281a7fa8c..9ecd5a0ec5 100644 --- a/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/bwc-test.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/bwc-test.jenkinsfile.txt @@ -37,7 +37,7 @@ BuildManifest.getArtifactRootUrl(dummy_job, 215) runBwcTestScript.echo(Artifact root URL: https://ci.opensearch.org/ci/dbc/dummy_job/1.2.0/215/linux/x64/tar) runBwcTestScript.echo(Paths: opensearch-dashboards=https://ci.opensearch.org/ci/dbc/dummy_job/1.2.0/215/linux/x64/tar) - runBwcTestScript.sh(./test.sh bwc-test manifests/tests/jenkins/data/opensearch-dashboards-1.2.0-test.yml --paths opensearch-dashboards=https://ci.opensearch.org/ci/dbc/dummy_job/1.2.0/215/linux/x64/tar) + runBwcTestScript.sh(./test.sh bwc-test manifests/tests/jenkins/data/opensearch-dashboards-1.2.0-test.yml --test-run-id 1 --paths opensearch-dashboards=https://ci.opensearch.org/ci/dbc/dummy_job/1.2.0/215/linux/x64/tar) bwc-test.script(groovy.lang.Closure) bwc-test.uploadTestResults({buildManifestFileName=tests/jenkins/data/opensearch-dashboards-1.2.0-build.yml, jobName=dummy_job, buildNumber=215}) uploadTestResults.legacySCM(groovy.lang.Closure) diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/integ-test.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/integ-test.jenkinsfile.txt index dddbe30387..ed9cdb15f0 100644 --- a/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/integ-test.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/integ-test.jenkinsfile.txt @@ -37,7 +37,7 @@ BuildManifest.getArtifactRootUrl(dummy_job, 215) runIntegTestScript.echo(Artifact root URL: https://ci.opensearch.org/ci/dbc/dummy_job/1.2.0/215/linux/x64/tar) runIntegTestScript.echo(Paths: opensearch=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.2.0/latest/linux/x64/tar opensearch-dashboards=https://ci.opensearch.org/ci/dbc/dummy_job/1.2.0/215/linux/x64/tar) - runIntegTestScript.sh(./test.sh integ-test manifests/tests/jenkins/data/opensearch-dashboards-1.2.0-test.yml --paths opensearch=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.2.0/latest/linux/x64/tar opensearch-dashboards=https://ci.opensearch.org/ci/dbc/dummy_job/1.2.0/215/linux/x64/tar) + runIntegTestScript.sh(./test.sh integ-test manifests/tests/jenkins/data/opensearch-dashboards-1.2.0-test.yml --test-run-id 1 --paths opensearch=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.2.0/latest/linux/x64/tar opensearch-dashboards=https://ci.opensearch.org/ci/dbc/dummy_job/1.2.0/215/linux/x64/tar) integ-test.script(groovy.lang.Closure) integ-test.uploadTestResults({buildManifestFileName=tests/jenkins/data/opensearch-dashboards-1.2.0-build.yml, jobName=dummy_job, buildNumber=215}) uploadTestResults.legacySCM(groovy.lang.Closure) diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/bwc-test.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/bwc-test.jenkinsfile.txt index 2c8dcec8ee..3d46486c93 100644 --- a/tests/jenkins/jenkinsjob-regression-files/opensearch/bwc-test.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/opensearch/bwc-test.jenkinsfile.txt @@ -37,7 +37,7 @@ BuildManifest.getArtifactRootUrl(dummy_job, 717) runBwcTestScript.echo(Artifact root URL: https://ci.opensearch.org/ci/dbc/dummy_job/1.3.0/717/linux/x64/tar) runBwcTestScript.echo(Paths: opensearch=https://ci.opensearch.org/ci/dbc/dummy_job/1.3.0/717/linux/x64/tar) - runBwcTestScript.sh(./test.sh bwc-test manifests/tests/jenkins/data/opensearch-1.3.0-test.yml --paths opensearch=https://ci.opensearch.org/ci/dbc/dummy_job/1.3.0/717/linux/x64/tar) + runBwcTestScript.sh(./test.sh bwc-test manifests/tests/jenkins/data/opensearch-1.3.0-test.yml --test-run-id 1 --paths opensearch=https://ci.opensearch.org/ci/dbc/dummy_job/1.3.0/717/linux/x64/tar) bwc-test.script(groovy.lang.Closure) bwc-test.uploadTestResults({buildManifestFileName=tests/jenkins/data/opensearch-1.3.0-build.yml, jobName=dummy_job, buildNumber=717}) uploadTestResults.legacySCM(groovy.lang.Closure) diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/integ-test.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/integ-test.jenkinsfile.txt index 7b9bd3072c..6f2e51ff9f 100644 --- a/tests/jenkins/jenkinsjob-regression-files/opensearch/integ-test.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/opensearch/integ-test.jenkinsfile.txt @@ -37,7 +37,7 @@ BuildManifest.getArtifactRootUrl(dummy_job, 717) runIntegTestScript.echo(Artifact root URL: https://ci.opensearch.org/ci/dbc/dummy_job/1.3.0/717/linux/x64/tar) runIntegTestScript.echo(Paths: opensearch=https://ci.opensearch.org/ci/dbc/dummy_job/1.3.0/717/linux/x64/tar) - runIntegTestScript.sh(./test.sh integ-test manifests/tests/jenkins/data/opensearch-1.3.0-test.yml --paths opensearch=https://ci.opensearch.org/ci/dbc/dummy_job/1.3.0/717/linux/x64/tar) + runIntegTestScript.sh(./test.sh integ-test manifests/tests/jenkins/data/opensearch-1.3.0-test.yml --test-run-id 1 --paths opensearch=https://ci.opensearch.org/ci/dbc/dummy_job/1.3.0/717/linux/x64/tar) integ-test.script(groovy.lang.Closure) integ-test.uploadTestResults({buildManifestFileName=tests/jenkins/data/opensearch-1.3.0-build.yml, jobName=dummy_job, buildNumber=717}) uploadTestResults.legacySCM(groovy.lang.Closure) diff --git a/tests/jenkins/jobs/RunBwcTestScript_Jenkinsfile.txt b/tests/jenkins/jobs/RunBwcTestScript_Jenkinsfile.txt index c75037aecc..2a898d1826 100644 --- a/tests/jenkins/jobs/RunBwcTestScript_Jenkinsfile.txt +++ b/tests/jenkins/jobs/RunBwcTestScript_Jenkinsfile.txt @@ -11,4 +11,4 @@ BuildManifest.getArtifactRootUrl(dummy_job, 717) runBwcTestScript.echo(Artifact root URL: https://ci.opensearch.org/ci/dbc/dummy_job/1.3.0/717/linux/x64/tar) runBwcTestScript.echo(Paths: opensearch=https://ci.opensearch.org/ci/dbc/dummy_job/1.3.0/717/linux/x64/tar) - runBwcTestScript.sh(./test.sh bwc-test tests/jenkins/data/opensearch-1.3.0-test.yml --paths opensearch=https://ci.opensearch.org/ci/dbc/dummy_job/1.3.0/717/linux/x64/tar) + runBwcTestScript.sh(./test.sh bwc-test tests/jenkins/data/opensearch-1.3.0-test.yml --test-run-id 1 --paths opensearch=https://ci.opensearch.org/ci/dbc/dummy_job/1.3.0/717/linux/x64/tar) diff --git a/tests/jenkins/jobs/RunBwcTestScript_OpenSearch_Dashboards_Jenkinsfile.txt b/tests/jenkins/jobs/RunBwcTestScript_OpenSearch_Dashboards_Jenkinsfile.txt index 534b95ba74..a75dbe29e6 100644 --- a/tests/jenkins/jobs/RunBwcTestScript_OpenSearch_Dashboards_Jenkinsfile.txt +++ b/tests/jenkins/jobs/RunBwcTestScript_OpenSearch_Dashboards_Jenkinsfile.txt @@ -11,4 +11,4 @@ BuildManifest.getArtifactRootUrl(dummy_job, 215) runBwcTestScript.echo(Artifact root URL: https://ci.opensearch.org/ci/dbc/dummy_job/1.2.0/215/linux/x64/tar) runBwcTestScript.echo(Paths: opensearch-dashboards=https://ci.opensearch.org/ci/dbc/dummy_job/1.2.0/215/linux/x64/tar) - runBwcTestScript.sh(./test.sh bwc-test tests/jenkins/data/opensearch-dashboards-1.2.0-test.yml --paths opensearch-dashboards=https://ci.opensearch.org/ci/dbc/dummy_job/1.2.0/215/linux/x64/tar) + runBwcTestScript.sh(./test.sh bwc-test tests/jenkins/data/opensearch-dashboards-1.2.0-test.yml --test-run-id 1 --paths opensearch-dashboards=https://ci.opensearch.org/ci/dbc/dummy_job/1.2.0/215/linux/x64/tar) diff --git a/tests/jenkins/jobs/RunIntegTestScript_Jenkinsfile.txt b/tests/jenkins/jobs/RunIntegTestScript_Jenkinsfile.txt index 125ece06aa..115d630767 100644 --- a/tests/jenkins/jobs/RunIntegTestScript_Jenkinsfile.txt +++ b/tests/jenkins/jobs/RunIntegTestScript_Jenkinsfile.txt @@ -11,4 +11,4 @@ BuildManifest.getArtifactRootUrl(dummy_job, 717) runIntegTestScript.echo(Artifact root URL: https://ci.opensearch.org/ci/dbc/dummy_job/1.3.0/717/linux/x64/tar) runIntegTestScript.echo(Paths: opensearch=https://ci.opensearch.org/ci/dbc/dummy_job/1.3.0/717/linux/x64/tar) - runIntegTestScript.sh(./test.sh integ-test tests/jenkins/data/opensearch-1.3.0-test.yml --paths opensearch=https://ci.opensearch.org/ci/dbc/dummy_job/1.3.0/717/linux/x64/tar) + runIntegTestScript.sh(./test.sh integ-test tests/jenkins/data/opensearch-1.3.0-test.yml --test-run-id 1 --paths opensearch=https://ci.opensearch.org/ci/dbc/dummy_job/1.3.0/717/linux/x64/tar) diff --git a/tests/jenkins/jobs/RunIntegTestScript_OpenSearch_Dashboards_Jenkinsfile.txt b/tests/jenkins/jobs/RunIntegTestScript_OpenSearch_Dashboards_Jenkinsfile.txt index ed99177f77..1885fe058a 100644 --- a/tests/jenkins/jobs/RunIntegTestScript_OpenSearch_Dashboards_Jenkinsfile.txt +++ b/tests/jenkins/jobs/RunIntegTestScript_OpenSearch_Dashboards_Jenkinsfile.txt @@ -11,4 +11,4 @@ BuildManifest.getArtifactRootUrl(dummy_job, 215) runIntegTestScript.echo(Artifact root URL: https://ci.opensearch.org/ci/dbc/dummy_job/1.2.0/215/linux/x64/tar) runIntegTestScript.echo(Paths: opensearch=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.2.0/latest/linux/x64/tar opensearch-dashboards=https://ci.opensearch.org/ci/dbc/dummy_job/1.2.0/215/linux/x64/tar) - runIntegTestScript.sh(./test.sh integ-test tests/jenkins/data/opensearch-dashboards-1.2.0-test.yml --paths opensearch=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.2.0/latest/linux/x64/tar opensearch-dashboards=https://ci.opensearch.org/ci/dbc/dummy_job/1.2.0/215/linux/x64/tar) + runIntegTestScript.sh(./test.sh integ-test tests/jenkins/data/opensearch-dashboards-1.2.0-test.yml --test-run-id 1 --paths opensearch=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.2.0/latest/linux/x64/tar opensearch-dashboards=https://ci.opensearch.org/ci/dbc/dummy_job/1.2.0/215/linux/x64/tar)