diff --git a/jenkins/opensearch-dashboards/integ-test.jenkinsfile b/jenkins/opensearch-dashboards/integ-test.jenkinsfile index 7a7550f438..812b733039 100644 --- a/jenkins/opensearch-dashboards/integ-test.jenkinsfile +++ b/jenkins/opensearch-dashboards/integ-test.jenkinsfile @@ -363,6 +363,14 @@ pipeline { always { node(AGENT_LABEL) { script { + def triggerIntegTestNotification = + build job: 'integ-test-notification', + propagate: false, + wait: false, + parameters: [ + string(name: 'INPUT_MANIFEST', value: "${env.version}/opensearch-dashboards-${env.version}.yml"), + string(name: 'DISTRIBUTION_NUMBER', value: "${env.buildId}") + ] postCleanup() } } diff --git a/jenkins/opensearch/integ-test.jenkinsfile b/jenkins/opensearch/integ-test.jenkinsfile index d7816b8b54..9dd9a5c6b3 100644 --- a/jenkins/opensearch/integ-test.jenkinsfile +++ b/jenkins/opensearch/integ-test.jenkinsfile @@ -321,6 +321,14 @@ pipeline { always { node(AGENT_LABEL) { script { + def triggerIntegTestNotification = + build job: 'integ-test-notification', + propagate: false, + wait: false, + parameters: [ + string(name: 'INPUT_MANIFEST', value: "${env.version}/opensearch-${env.version}.yml"), + string(name: 'DISTRIBUTION_NUMBER', value: "${env.buildId}") + ] postCleanup() } } diff --git a/tests/jenkins/TestOpenSearchDashboardsIntegTest.groovy b/tests/jenkins/TestOpenSearchDashboardsIntegTest.groovy index 387e3dfc4e..7cd7ef21a4 100644 --- a/tests/jenkins/TestOpenSearchDashboardsIntegTest.groovy +++ b/tests/jenkins/TestOpenSearchDashboardsIntegTest.groovy @@ -117,6 +117,9 @@ class TestOpenSearchDashboardsIntegTest extends BuildPipelineTest { assertThat(getCommandExecutions('sh', 'report.sh'), hasItems('./report.sh manifests/tests/jenkins/data/opensearch-dashboards-3.0.0-test.yml --artifact-paths opensearch=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/3.0.0/215/linux/x64/tar opensearch-dashboards=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/3.0.0/215/linux/x64/tar --test-run-id 215 --test-type integ-test --base-path DUMMY_PUBLIC_ARTIFACT_URL/dummy_job/3.0.0/215/linux/x64/tar --release-candidate 0 ')) assertCallStack().contains('curl -sSL https://ci.opensearch.org/ci/dbc/integ-test-opensearch-dashboards/3.0.0/215/linux/x64/tar/test-results/215/integ-test/test-report.yml --output test-results-osd-215/test-report.yml') assertCallStack().contains('{distributionBuildUrl=https://build.ci.opensearch.org/blue/organizations/jenkins/distribution-build-opensearch-dashboards/detail/distribution-build-opensearch-dashboards/215/pipeline, jobName=dummy_job, testReportManifestYml=test-results-osd-215/test-report.yml}') + assertCallStack().contains('integ-test.build({job=integ-test-notification, propagate=false, wait=false, parameters=[null, null]})') + assertCallStack().contains('integ-test.string({name=INPUT_MANIFEST, value=3.0.0/opensearch-dashboards-3.0.0.yml})') + assertCallStack().contains('integ-test.string({name=DISTRIBUTION_NUMBER, value=215})') } @Test diff --git a/tests/jenkins/TestOpenSearchIntegTest.groovy b/tests/jenkins/TestOpenSearchIntegTest.groovy index 523a4de85d..789b514350 100644 --- a/tests/jenkins/TestOpenSearchIntegTest.groovy +++ b/tests/jenkins/TestOpenSearchIntegTest.groovy @@ -97,6 +97,9 @@ class TestOpenSearchIntegTest extends BuildPipelineTest { assertThat(getCommandExecutions('echo', 'Testing'), hasItem('Testing components: [ml-commons, anomaly-detection, neural-search, security-analytics, security, k-NN, notifications]')) 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') assertCallStack().contains('{distributionBuildUrl=https://build.ci.opensearch.org/blue/organizations/jenkins/distribution-build-opensearch/detail/distribution-build-opensearch/9010/pipeline, jobName=dummy_job, testReportManifestYml=test-results-os-234/test-report.yml}') + assertCallStack().contains('integ-test.build({job=integ-test-notification, propagate=false, wait=false, parameters=[null, null]})') + assertCallStack().contains('integ-test.string({name=INPUT_MANIFEST, value=3.0.0/opensearch-3.0.0.yml})') + assertCallStack().contains('integ-test.string({name=DISTRIBUTION_NUMBER, value=9010})') } @Test diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/integ-test-without-validation.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/integ-test-without-validation.jenkinsfile.txt index 97f0709ef3..f5cd6f7c93 100644 --- a/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/integ-test-without-validation.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/integ-test-without-validation.jenkinsfile.txt @@ -472,5 +472,8 @@ postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true}) integ-test.node(Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, groovy.lang.Closure) integ-test.script(groovy.lang.Closure) + integ-test.string({name=INPUT_MANIFEST, value=3.0.0/opensearch-dashboards-3.0.0.yml}) + integ-test.string({name=DISTRIBUTION_NUMBER, value=215}) + integ-test.build({job=integ-test-notification, propagate=false, wait=false, parameters=[null, null]}) integ-test.postCleanup() postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true}) 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 314bed9086..c51cab8396 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 @@ -484,5 +484,8 @@ postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true}) integ-test.node(Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, groovy.lang.Closure) integ-test.script(groovy.lang.Closure) + integ-test.string({name=INPUT_MANIFEST, value=3.0.0/opensearch-dashboards-3.0.0.yml}) + integ-test.string({name=DISTRIBUTION_NUMBER, value=215}) + integ-test.build({job=integ-test-notification, propagate=false, wait=false, parameters=[null, null]}) integ-test.postCleanup() postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true}) diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/integ-test-without-validation.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/integ-test-without-validation.jenkinsfile.txt index 1b5321332f..2f13372368 100644 --- a/tests/jenkins/jenkinsjob-regression-files/opensearch/integ-test-without-validation.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/opensearch/integ-test-without-validation.jenkinsfile.txt @@ -498,5 +498,8 @@ postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true}) integ-test.node(Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, groovy.lang.Closure) integ-test.script(groovy.lang.Closure) + integ-test.string({name=INPUT_MANIFEST, value=3.0.0/opensearch-3.0.0.yml}) + integ-test.string({name=DISTRIBUTION_NUMBER, value=9010}) + integ-test.build({job=integ-test-notification, propagate=false, wait=false, parameters=[null, null]}) integ-test.postCleanup() postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true}) 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 83aec53c8f..2d657e9edd 100644 --- a/tests/jenkins/jenkinsjob-regression-files/opensearch/integ-test.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/opensearch/integ-test.jenkinsfile.txt @@ -509,5 +509,8 @@ postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true}) integ-test.node(Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, groovy.lang.Closure) integ-test.script(groovy.lang.Closure) + integ-test.string({name=INPUT_MANIFEST, value=3.0.0/opensearch-3.0.0.yml}) + integ-test.string({name=DISTRIBUTION_NUMBER, value=9010}) + integ-test.build({job=integ-test-notification, propagate=false, wait=false, parameters=[null, null]}) integ-test.postCleanup() postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})