Skip to content

Rename webhooks for notifications #2322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gaiksaya merged 1 commit into from
Jul 11, 2022
Merged

Rename webhooks for notifications #2322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jenkins/check-for-build.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ pipeline {
publishNotification(
icon: ':warning:',
message: 'Failed checking for build to trigger',
credentialsId: 'BUILD_NOTICE_WEBHOOK',
credentialsId: 'jenkins-build-notice-webhook',
manifest: "${INPUT_MANIFEST}",
target_job_name: "${TARGET_JOB_NAME}"
)
Expand Down
4 changes: 2 additions & 2 deletions jenkins/cross-cluster-replication/perf-test.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ pipeline {
icon: ':white_check_mark:',
message: 'CCR Performance Tests Successful',
extra: stashed,
credentialsId: 'INTEG_TEST_WEBHOOK',
credentialsId: 'jenkins-integ-test-webhook',
)
postCleanup()
}
Expand All @@ -130,7 +130,7 @@ pipeline {
icon: ':warning:',
message: 'Failed CCR Performance Tests',
extra: stashed,
credentialsId: 'INTEG_TEST_WEBHOOK',
credentialsId: 'jenkins-integ-test-webhook',
)
postCleanup()
}
Expand Down
4 changes: 2 additions & 2 deletions jenkins/opensearch-dashboards/bwc-test.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ pipeline {
icon: ':white_check_mark:',
message: 'BWC Tests Successful',
extra: stashed,
credentialsId: 'INTEG_TEST_WEBHOOK',
credentialsId: 'jenkins-integ-test-webhook',
manifest: TEST_MANIFEST,
)

Expand All @@ -136,7 +136,7 @@ pipeline {
icon: ':warning:',
message: 'Failed BWC Tests',
extra: stashed,
credentialsId: 'INTEG_TEST_WEBHOOK',
credentialsId: 'jenkins-integ-test-webhook',
manifest: TEST_MANIFEST,
)

Expand Down
4 changes: 2 additions & 2 deletions jenkins/opensearch-dashboards/distribution-build.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ pipeline {
icon: ':white_check_mark:',
message: 'Successful Build',
extra: stashed,
credentialsId: 'BUILD_NOTICE_WEBHOOK',
credentialsId: 'jenkins-build-notice-webhook',
manifest: "${INPUT_MANIFEST}"
)
}
Expand All @@ -534,7 +534,7 @@ pipeline {
publishNotification(
icon: ':warning:',
message: 'Failed Build',
credentialsId: 'BUILD_NOTICE_WEBHOOK',
credentialsId: 'jenkins-build-notice-webhook',
manifest: "${INPUT_MANIFEST}"
)
}
Expand Down
4 changes: 2 additions & 2 deletions jenkins/opensearch-dashboards/integ-test.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ pipeline {
icon: ':white_check_mark:',
message: 'Integration Tests Successful',
extra: stashed,
credentialsId: 'INTEG_TEST_WEBHOOK',
credentialsId: 'jenkins-integ-test-webhook',
manifest: TEST_MANIFEST,
)

Expand All @@ -131,7 +131,7 @@ pipeline {
icon: ':warning:',
message: 'Failed Integration Tests',
extra: stashed,
credentialsId: 'INTEG_TEST_WEBHOOK',
credentialsId: 'jenkins-integ-test-webhook',
manifest: TEST_MANIFEST,
)

Expand Down
4 changes: 2 additions & 2 deletions jenkins/opensearch/bwc-test.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ pipeline {
icon: ':white_check_mark:',
message: 'BWC Tests Successful',
extra: stashed,
credentialsId: 'INTEG_TEST_WEBHOOK',
credentialsId: 'jenkins-integ-test-webhook',
manifest: TEST_MANIFEST,
)

Expand All @@ -139,7 +139,7 @@ pipeline {
icon: ':warning:',
message: 'Failed BWC Tests',
extra: stashed,
credentialsId: 'INTEG_TEST_WEBHOOK',
credentialsId: 'jenkins-integ-test-webhook',
manifest: TEST_MANIFEST,
)

Expand Down
4 changes: 2 additions & 2 deletions jenkins/opensearch/distribution-build.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ pipeline {
icon: ':white_check_mark:',
message: 'Successful Build',
extra: stashed,
credentialsId: 'BUILD_NOTICE_WEBHOOK',
credentialsId: 'jenkins-build-notice-webhook',
manifest: "${INPUT_MANIFEST}"
)
}
Expand All @@ -571,7 +571,7 @@ pipeline {
publishNotification(
icon: ':warning:',
message: buildFailureMessage(),
credentialsId: 'BUILD_NOTICE_WEBHOOK',
credentialsId: 'jenkins-build-notice-webhook',
manifest: "${INPUT_MANIFEST}"
)
}
Expand Down
4 changes: 2 additions & 2 deletions jenkins/opensearch/integ-test.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ pipeline {
icon: ':white_check_mark:',
message: 'Integration Tests Successful',
extra: stashed,
credentialsId: 'INTEG_TEST_WEBHOOK',
credentialsId: 'jenkins-integ-test-webhook',
manifest: TEST_MANIFEST,
)

Expand All @@ -168,7 +168,7 @@ pipeline {
icon: ':warning:',
message: 'Failed Integration Tests',
extra: stashed,
credentialsId: 'INTEG_TEST_WEBHOOK',
credentialsId: 'jenkins-integ-test-webhook',
manifest: TEST_MANIFEST,
)

Expand Down
4 changes: 2 additions & 2 deletions jenkins/opensearch/perf-test.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ pipeline {
icon: ':white_check_mark:',
message: 'Performance Tests Successful',
extra: stashed,
credentialsId: 'INTEG_TEST_WEBHOOK',
credentialsId: 'jenkins-integ-test-webhook',
)
postCleanup()
}
Expand All @@ -208,7 +208,7 @@ pipeline {
icon: ':warning:',
message: 'Failed Performance Tests',
extra: stashed,
credentialsId: 'INTEG_TEST_WEBHOOK',
credentialsId: 'jenkins-integ-test-webhook',
)
postCleanup()
}
Expand Down
2 changes: 1 addition & 1 deletion tests/jenkins/TestOpenSearchBwcTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class TestOpenSearchBwcTest extends BuildPipelineTest {
'BWC Tests Successful',
'',
testManifest,
'INTEG_TEST_WEBHOOK'))
'jenkins-integ-test-webhook'))
super.setUp()

// Variables
Expand Down
2 changes: 1 addition & 1 deletion tests/jenkins/TestOpenSearchDashboardsBwcTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class TestOpenSearchDashboardsBwcTest extends BuildPipelineTest {
'BWC Tests Successful',
'',
testManifest,
'INTEG_TEST_WEBHOOK'))
'jenkins-integ-test-webhook'))
super.setUp()

// Variables
Expand Down
2 changes: 1 addition & 1 deletion tests/jenkins/TestOpenSearchDashboardsIntegTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class TestOpenSearchDashboardsIntegTest extends BuildPipelineTest {
'Integration Tests Successful',
'',
testManifest,
'INTEG_TEST_WEBHOOK'))
'jenkins-integ-test-webhook'))
super.setUp()

// Variables
Expand Down
2 changes: 1 addition & 1 deletion tests/jenkins/TestOpenSearchIntegTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class TestOpenSearchIntegTest extends BuildPipelineTest {
'Integration Tests Successful',
'',
testManifest,
'INTEG_TEST_WEBHOOK'))
'jenkins-integ-test-webhook'))
super.setUp()

// Variables
Expand Down
2 changes: 1 addition & 1 deletion tests/jenkins/TestPublishNotification.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class TestPublishNotification extends BuildPipelineTest {
void setUp() {

this.registerLibTester(new PublishNotificationLibTester(
':white_check_mark:', 'Successful Build' , 'extra', '1.2.0/opensearch-1.2.0.yml', 'BUILD_NOTICE_WEBHOOK'))
':white_check_mark:', 'Successful Build' , 'extra', '1.2.0/opensearch-1.2.0.yml', 'jenkins-build-notice-webhook'))

super.setUp()
}
Expand Down
4 changes: 2 additions & 2 deletions ...s/jenkins/jenkinsjob-regression-files/cross-cluster-replication/perf-test.jenkinsfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ CCR Performance tests for 1236 completed})
perf-test.findFiles({excludes=, glob=messages/*})
perf-test.dir(messages, groovy.lang.Closure)
perf-test.deleteDir()
perf-test.publishNotification({icon=:white_check_mark:, message=CCR Performance Tests Successful, extra=, credentialsId=INTEG_TEST_WEBHOOK})
publishNotification.string({credentialsId=INTEG_TEST_WEBHOOK, variable=WEBHOOK_URL})
perf-test.publishNotification({icon=:white_check_mark:, message=CCR Performance Tests Successful, extra=, credentialsId=jenkins-integ-test-webhook})
publishNotification.string({credentialsId=jenkins-integ-test-webhook, variable=WEBHOOK_URL})
publishNotification.withCredentials([WEBHOOK_URL], groovy.lang.Closure)
publishNotification.sh(curl -XPOST --header "Content-Type: application/json" --data '{"result_text":":white_check_mark:
JOB_NAME=perf-test
Expand Down
4 changes: 2 additions & 2 deletions tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/bwc-test.jenkinsfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@
bwc-test.findFiles({excludes=, glob=messages/*})
bwc-test.dir(messages, groovy.lang.Closure)
bwc-test.deleteDir()
bwc-test.publishNotification({icon=:white_check_mark:, message=BWC Tests Successful, extra=, credentialsId=INTEG_TEST_WEBHOOK, manifest=tests/jenkins/data/opensearch-dashboards-1.2.0-test.yml})
publishNotification.string({credentialsId=INTEG_TEST_WEBHOOK, variable=WEBHOOK_URL})
bwc-test.publishNotification({icon=:white_check_mark:, message=BWC Tests Successful, extra=, credentialsId=jenkins-integ-test-webhook, manifest=tests/jenkins/data/opensearch-dashboards-1.2.0-test.yml})
publishNotification.string({credentialsId=jenkins-integ-test-webhook, variable=WEBHOOK_URL})
publishNotification.withCredentials([WEBHOOK_URL], groovy.lang.Closure)
publishNotification.sh(curl -XPOST --header "Content-Type: application/json" --data '{"result_text":":white_check_mark:
JOB_NAME=dummy_job
Expand Down
4 changes: 2 additions & 2 deletions tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/integ-test.jenkinsfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@
integ-test.findFiles({excludes=, glob=messages/*})
integ-test.dir(messages, groovy.lang.Closure)
integ-test.deleteDir()
integ-test.publishNotification({icon=:white_check_mark:, message=Integration Tests Successful, extra=, credentialsId=INTEG_TEST_WEBHOOK, manifest=tests/jenkins/data/opensearch-dashboards-1.2.0-test.yml})
publishNotification.string({credentialsId=INTEG_TEST_WEBHOOK, variable=WEBHOOK_URL})
integ-test.publishNotification({icon=:white_check_mark:, message=Integration Tests Successful, extra=, credentialsId=jenkins-integ-test-webhook, manifest=tests/jenkins/data/opensearch-dashboards-1.2.0-test.yml})
publishNotification.string({credentialsId=jenkins-integ-test-webhook, variable=WEBHOOK_URL})
publishNotification.withCredentials([WEBHOOK_URL], groovy.lang.Closure)
publishNotification.sh(curl -XPOST --header "Content-Type: application/json" --data '{"result_text":":white_check_mark:
JOB_NAME=dummy_job
Expand Down
4 changes: 2 additions & 2 deletions tests/jenkins/jenkinsjob-regression-files/opensearch/bwc-test.jenkinsfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@
bwc-test.findFiles({excludes=, glob=messages/*})
bwc-test.dir(messages, groovy.lang.Closure)
bwc-test.deleteDir()
bwc-test.publishNotification({icon=:white_check_mark:, message=BWC Tests Successful, extra=, credentialsId=INTEG_TEST_WEBHOOK, manifest=tests/jenkins/data/opensearch-1.3.0-test.yml})
publishNotification.string({credentialsId=INTEG_TEST_WEBHOOK, variable=WEBHOOK_URL})
bwc-test.publishNotification({icon=:white_check_mark:, message=BWC Tests Successful, extra=, credentialsId=jenkins-integ-test-webhook, manifest=tests/jenkins/data/opensearch-1.3.0-test.yml})
publishNotification.string({credentialsId=jenkins-integ-test-webhook, variable=WEBHOOK_URL})
publishNotification.withCredentials([WEBHOOK_URL], groovy.lang.Closure)
publishNotification.sh(curl -XPOST --header "Content-Type: application/json" --data '{"result_text":":white_check_mark:
JOB_NAME=dummy_job
Expand Down
4 changes: 2 additions & 2 deletions tests/jenkins/jenkinsjob-regression-files/opensearch/integ-test.jenkinsfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
integ-test.findFiles({excludes=, glob=messages/*})
integ-test.dir(messages, groovy.lang.Closure)
integ-test.deleteDir()
integ-test.publishNotification({icon=:white_check_mark:, message=Integration Tests Successful, extra=, credentialsId=INTEG_TEST_WEBHOOK, manifest=tests/jenkins/data/opensearch-1.3.0-test.yml})
publishNotification.string({credentialsId=INTEG_TEST_WEBHOOK, variable=WEBHOOK_URL})
integ-test.publishNotification({icon=:white_check_mark:, message=Integration Tests Successful, extra=, credentialsId=jenkins-integ-test-webhook, manifest=tests/jenkins/data/opensearch-1.3.0-test.yml})
publishNotification.string({credentialsId=jenkins-integ-test-webhook, variable=WEBHOOK_URL})
publishNotification.withCredentials([WEBHOOK_URL], groovy.lang.Closure)
publishNotification.sh(curl -XPOST --header "Content-Type: application/json" --data '{"result_text":":white_check_mark:
JOB_NAME=dummy_job
Expand Down
4 changes: 2 additions & 2 deletions tests/jenkins/jenkinsjob-regression-files/opensearch/perf-test-with-security.jenkinsfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@ Performance tests without security for 1236 completed})
perf-test.findFiles({excludes=, glob=messages/*})
perf-test.dir(messages, groovy.lang.Closure)
perf-test.deleteDir()
perf-test.publishNotification({icon=:white_check_mark:, message=Performance Tests Successful, extra=, credentialsId=INTEG_TEST_WEBHOOK})
publishNotification.string({credentialsId=INTEG_TEST_WEBHOOK, variable=WEBHOOK_URL})
perf-test.publishNotification({icon=:white_check_mark:, message=Performance Tests Successful, extra=, credentialsId=jenkins-integ-test-webhook})
publishNotification.string({credentialsId=jenkins-integ-test-webhook, variable=WEBHOOK_URL})
publishNotification.withCredentials([WEBHOOK_URL], groovy.lang.Closure)
publishNotification.sh(curl -XPOST --header "Content-Type: application/json" --data '{"result_text":":white_check_mark:
JOB_NAME=perf-test
Expand Down
4 changes: 2 additions & 2 deletions tests/jenkins/jenkinsjob-regression-files/opensearch/perf-test.jenkinsfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ Performance tests without security for 1236 completed})
perf-test.findFiles({excludes=, glob=messages/*})
perf-test.dir(messages, groovy.lang.Closure)
perf-test.deleteDir()
perf-test.publishNotification({icon=:white_check_mark:, message=Performance Tests Successful, extra=, credentialsId=INTEG_TEST_WEBHOOK})
publishNotification.string({credentialsId=INTEG_TEST_WEBHOOK, variable=WEBHOOK_URL})
perf-test.publishNotification({icon=:white_check_mark:, message=Performance Tests Successful, extra=, credentialsId=jenkins-integ-test-webhook})
publishNotification.string({credentialsId=jenkins-integ-test-webhook, variable=WEBHOOK_URL})
publishNotification.withCredentials([WEBHOOK_URL], groovy.lang.Closure)
publishNotification.sh(curl -XPOST --header "Content-Type: application/json" --data '{"result_text":":white_check_mark:
JOB_NAME=perf-test
Expand Down
2 changes: 1 addition & 1 deletion tests/jenkins/jobs/PublishNotification_Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pipeline {
message: 'Successful Build',
extra: 'extra',
manifest: '1.2.0/opensearch-1.2.0.yml',
credentialsId: 'BUILD_NOTICE_WEBHOOK'
credentialsId: 'jenkins-build-notice-webhook'
)
}catch (Exception e) {
echo 'Exception occurred: ' + e.toString()
Expand Down
4 changes: 2 additions & 2 deletions tests/jenkins/jobs/PublishNotification_Jenkinsfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
PublishNotification_Jenkinsfile.echo(Executing on agent [label:none])
PublishNotification_Jenkinsfile.stage(notify, groovy.lang.Closure)
PublishNotification_Jenkinsfile.script(groovy.lang.Closure)
PublishNotification_Jenkinsfile.publishNotification({icon=:white_check_mark:, message=Successful Build, extra=extra, manifest=1.2.0/opensearch-1.2.0.yml, credentialsId=BUILD_NOTICE_WEBHOOK})
publishNotification.string({credentialsId=BUILD_NOTICE_WEBHOOK, variable=WEBHOOK_URL})
PublishNotification_Jenkinsfile.publishNotification({icon=:white_check_mark:, message=Successful Build, extra=extra, manifest=1.2.0/opensearch-1.2.0.yml, credentialsId=jenkins-build-notice-webhook})
publishNotification.string({credentialsId=jenkins-build-notice-webhook, variable=WEBHOOK_URL})
publishNotification.withCredentials([WEBHOOK_URL], groovy.lang.Closure)
publishNotification.sh(curl -XPOST --header "Content-Type: application/json" --data '{"result_text":":white_check_mark:
JOB_NAME=dummy_job
Expand Down