From 7f11917f9a03b7f83ecc9d31f28858e61490dfc3 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 5 Oct 2022 15:57:33 -0400 Subject: [PATCH 1/2] Add timeout and throttle to the jenkins workflows Signed-off-by: Peter Zhu --- jenkins/publish-snapshot.jenkinsfile | 12 ++++++++++++ jenkins/stage-maven-release.jenkinsfile | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/jenkins/publish-snapshot.jenkinsfile b/jenkins/publish-snapshot.jenkinsfile index b5d77cb23..73ffdce60 100644 --- a/jenkins/publish-snapshot.jenkinsfile +++ b/jenkins/publish-snapshot.jenkinsfile @@ -1,4 +1,16 @@ pipeline { + options { + timeout(time: 30, unit: 'MINUTES') + throttleJobProperty( + categories: [], + limitOneJobWithMatchingParams: false, + maxConcurrentPerNode: 0, + maxConcurrentTotal: 1, + paramsToUseForLimit: '', + throttleEnabled: true, + throttleOption: 'project', + ) + } agent { docker { label 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host' diff --git a/jenkins/stage-maven-release.jenkinsfile b/jenkins/stage-maven-release.jenkinsfile index ae8f21f2c..80969ce21 100644 --- a/jenkins/stage-maven-release.jenkinsfile +++ b/jenkins/stage-maven-release.jenkinsfile @@ -4,6 +4,18 @@ lib = library(identifier: 'jenkins@main', retriever: modernSCM([ ])) pipeline { + options { + timeout(time: 30, unit: 'MINUTES') + throttleJobProperty( + categories: [], + limitOneJobWithMatchingParams: false, + maxConcurrentPerNode: 0, + maxConcurrentTotal: 1, + paramsToUseForLimit: '', + throttleEnabled: true, + throttleOption: 'project', + ) + } agent { docker { label 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host' From ed0ba41fe6f103cf056e91151c11ef95ae3ccdf5 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Mon, 24 Oct 2022 21:06:31 -0400 Subject: [PATCH 2/2] Add changelog Signed-off-by: Peter Zhu --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90e65f899..8eb5e987b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Update literature around changelog contributions in CONTRIBUTING.md ([#242](https://github.com/opensearch-project/opensearch-java/pull/242)) - Update tests to use JUnit's Assert ([#244](https://github.com/opensearch-project/opensearch-java/pull/244)) - Add support to parse sub-aggregations from filter/nested aggregations ([#234](https://github.com/opensearch-project/opensearch-java/pull/234)) +- Add timeout and throttle to the jenkins workflows ([#231](https://github.com/opensearch-project/opensearch-java/pull/231)) ### Deprecated @@ -23,4 +24,4 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ### Security -[Unreleased]: https://github.com/opensearch-project/opensearch-java/compare/2.0...HEAD \ No newline at end of file +[Unreleased]: https://github.com/opensearch-project/opensearch-java/compare/2.0...HEAD