Skip to content

Commit a3da77a

Browse files
Update integTests to match 8.3.2 libs updates (#5395)
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
1 parent c417eb6 commit a3da77a

8 files changed

+251
-258
lines changed

jenkins/opensearch-dashboards/integ-test.jenkinsfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* compatible open source license.
88
*/
99

10-
lib = library(identifier: 'jenkins@8.3.0', retriever: modernSCM([
10+
lib = library(identifier: 'jenkins@8.3.2', retriever: modernSCM([
1111
$class: 'GitSCMSource',
1212
remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
1313
]))
@@ -259,7 +259,7 @@ pipeline {
259259
artifactBucketName: "${ARTIFACT_BUCKET_NAME}",
260260
distribution: "${distribution}",
261261
buildManifest: "${BUILD_MANIFEST}",
262-
testManifest: "${TEST_MANIFEST}"
262+
testManifest: "manifests/${TEST_MANIFEST}"
263263
)
264264
}
265265
} catch (e) {
@@ -306,7 +306,7 @@ pipeline {
306306
artifactBucketName: "${ARTIFACT_BUCKET_NAME}",
307307
distribution: "${distribution}",
308308
buildManifest: "${BUILD_MANIFEST}",
309-
testManifest: "${TEST_MANIFEST}"
309+
testManifest: "manifests/${TEST_MANIFEST}"
310310
)
311311
}
312312
} catch (e) {

jenkins/opensearch/integ-test.jenkinsfile

+1-8
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* compatible open source license.
88
*/
99

10-
lib = library(identifier: 'jenkins@8.3.0', retriever: modernSCM([
10+
lib = library(identifier: 'jenkins@8.3.2', retriever: modernSCM([
1111
$class: 'GitSCMSource',
1212
remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
1313
]))
@@ -43,13 +43,6 @@ pipeline {
4343
BUILD_JOB_NAME = 'distribution-build-opensearch'
4444
ARTIFACT_BUCKET_NAME = credentials('jenkins-artifact-bucket-name')
4545
}
46-
// Add as follows to enable parameterizedCron trigger for a specific test manifest.
47-
/*triggers {
48-
parameterizedCron '''
49-
H 1 * * * %TEST_MANIFEST=2.12.0/opensearch-2.12.0-concurrent-search-test.yml;BUILD_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.12.0/latest/linux/arm64/tar/builds/opensearch/manifest.yml
50-
H 1 * * * %TEST_MANIFEST=2.12.0/opensearch-2.12.0-concurrent-search-test.yml;BUILD_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.12.0/latest/linux/x64/tar/builds/opensearch/manifest.yml
51-
'''
52-
}*/
5346
parameters {
5447
string(
5548
name: 'COMPONENT_NAME',

tests/jenkins/TestOpenSearchDashboardsIntegTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class TestOpenSearchDashboardsIntegTest extends BuildPipelineTest {
2626

2727
helper.registerSharedLibrary(
2828
library().name('jenkins')
29-
.defaultVersion('8.0.0')
29+
.defaultVersion('8.3.2')
3030
.allowOverride(true)
3131
.implicit(true)
3232
.targetPath('vars')

tests/jenkins/TestOpenSearchIntegTest.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class TestOpenSearchIntegTest extends BuildPipelineTest {
2525

2626
helper.registerSharedLibrary(
2727
library().name('jenkins')
28-
.defaultVersion('7.3.0')
28+
.defaultVersion('8.3.2')
2929
.allowOverride(true)
3030
.implicit(true)
3131
.targetPath('vars')
@@ -92,7 +92,7 @@ class TestOpenSearchIntegTest extends BuildPipelineTest {
9292
super.testPipeline('jenkins/opensearch/integ-test.jenkinsfile',
9393
'tests/jenkins/jenkinsjob-regression-files/opensearch/integ-test.jenkinsfile')
9494
assert getCommandExecutions('stage', 'validate-artifacts').size() == 1
95-
assertThat(getCommandExecutions('sh', 'test.sh'), hasItem('env PATH=$PATH JAVA_HOME=/opt/java/openjdk-17 ./test.sh integ-test manifests/tests/jenkins/data/opensearch-3.0.0-test.yml --component k-NN --test-run-id 234 --paths opensearch=/tmp/workspace/tar --base-path DUMMY_PUBLIC_ARTIFACT_URL/dummy_job/3.0.0/9010/linux/x64/tar '))
95+
assertThat(getCommandExecutions('sh', 'test.sh'), hasItem('env PATH=$PATH JAVA_HOME=/opt/java/openjdk-17 ./test.sh integ-test manifests/tests/jenkins/data/opensearch-3.0.0-test.yml --component ml-commons --test-run-id 234 --paths opensearch=/tmp/workspace/tar --base-path DUMMY_PUBLIC_ARTIFACT_URL/dummy_job/3.0.0/9010/linux/x64/tar '))
9696
assertThat(getCommandExecutions('sh', 'report.sh'), hasItem('./report.sh manifests/tests/jenkins/data/opensearch-3.0.0-test.yml --artifact-paths opensearch=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/3.0.0/9010/linux/x64/tar --test-run-id 234 --test-type integ-test --base-path DUMMY_PUBLIC_ARTIFACT_URL/dummy_job/3.0.0/9010/linux/x64/tar --release-candidate 0 '))
9797
assertThat(getCommandExecutions('echo', 'Testing'), hasItem('Testing components: [ml-commons, anomaly-detection, neural-search, security-analytics, security, k-NN, notifications]'))
9898
assertCallStack().contains('curl -sSL https://ci.opensearch.org/ci/dbc/integ-test/3.0.0/9010/linux/x64/tar/test-results/234/integ-test/test-report.yml --output test-results-os-234/test-report.yml')

0 commit comments

Comments
 (0)