Skip to content

Commit

Permalink
Increase osd integTest timeout to 6 hours for OSD core (#4795)
Browse files Browse the repository at this point in the history 
Signed-off-by: Peter Zhu <[email protected]>
  • Loading branch information
@peterzhuamazon
peterzhuamazon authored Jun 20, 2024
1 parent af2f02c commit aefb420
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions jenkins/opensearch-dashboards/integ-test.jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def agent_nodes = [

pipeline {
options {
timeout(time: 6, unit: 'HOURS')
timeout(time: 7, unit: 'HOURS')
buildDiscarder(logRotator(daysToKeepStr: '30'))
}
agent none
Expand Down Expand Up @@ -238,7 +238,7 @@ pipeline {
echo "Adding Component: ${local_component}"
componentTests["Run Integtest ${local_component}"] = {
// Using scripted pipelines to trigger dynamic parallel stages
timeout(time: 5, unit: 'HOURS') {
timeout(time: 6, unit: 'HOURS') {
node(AGENT_LABEL) {
docker.withRegistry('https://public.ecr.aws/') {
docker.image(docker_images["$distribution"]).inside(docker_args["$distribution"]) {
Expand Down
16 changes: 8 additions & 8 deletions ...sjob-regression-files/opensearch-dashboards/integ-test-without-validation.jenkinsfile.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
integ-test.library({[email protected], retriever=null})
integ-test.pipeline(groovy.lang.Closure)
integ-test.credentials(jenkins-artifact-bucket-name)
integ-test.timeout({time=6, unit=HOURS})
integ-test.timeout({time=7, unit=HOURS})
integ-test.logRotator({daysToKeepStr=30})
integ-test.buildDiscarder(null)
integ-test.echo(Executing on agent [label:none])
Expand Down Expand Up @@ -77,7 +77,7 @@
integ-test.echo(Adding Component: queryWorkbenchDashboards)
integ-test.echo(Adding Component: observabilityDashboards)
integ-test.parallel({Run Integtest ganttChartDashboards=groovy.lang.Closure, Run Integtest indexManagementDashboards=groovy.lang.Closure, Run Integtest anomalyDetectionDashboards=groovy.lang.Closure, Run Integtest OpenSearch-Dashboards=groovy.lang.Closure, Run Integtest reportsDashboards=groovy.lang.Closure, Run Integtest queryWorkbenchDashboards=groovy.lang.Closure, Run Integtest observabilityDashboards=groovy.lang.Closure})
integ-test.timeout({time=5, unit=HOURS}, groovy.lang.Closure)
integ-test.timeout({time=6, unit=HOURS}, groovy.lang.Closure)
integ-test.node(Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, groovy.lang.Closure)
integ-test.sh(echo ganttChartDashboards with index 0 will sleep 0 seconds to reduce load && sleep 0)
integ-test.unstash(integtest-opensearch-dashboards-215)
Expand Down Expand Up @@ -124,7 +124,7 @@
uploadTestResults.stash({includes=messages/*, name=messages-DUMMY_STAGE_NAME})
integ-test.postCleanup()
postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})
integ-test.timeout({time=5, unit=HOURS}, groovy.lang.Closure)
integ-test.timeout({time=6, unit=HOURS}, groovy.lang.Closure)
integ-test.node(Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, groovy.lang.Closure)
integ-test.sh(echo indexManagementDashboards with index 1 will sleep 20 seconds to reduce load && sleep 20)
integ-test.unstash(integtest-opensearch-dashboards-215)
Expand Down Expand Up @@ -171,7 +171,7 @@
uploadTestResults.stash({includes=messages/*, name=messages-DUMMY_STAGE_NAME})
integ-test.postCleanup()
postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})
integ-test.timeout({time=5, unit=HOURS}, groovy.lang.Closure)
integ-test.timeout({time=6, unit=HOURS}, groovy.lang.Closure)
integ-test.node(Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, groovy.lang.Closure)
integ-test.sh(echo anomalyDetectionDashboards with index 2 will sleep 40 seconds to reduce load && sleep 40)
integ-test.unstash(integtest-opensearch-dashboards-215)
Expand Down Expand Up @@ -218,7 +218,7 @@
uploadTestResults.stash({includes=messages/*, name=messages-DUMMY_STAGE_NAME})
integ-test.postCleanup()
postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})
integ-test.timeout({time=5, unit=HOURS}, groovy.lang.Closure)
integ-test.timeout({time=6, unit=HOURS}, groovy.lang.Closure)
integ-test.node(Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, groovy.lang.Closure)
integ-test.sh(echo OpenSearch-Dashboards with index 3 will sleep 60 seconds to reduce load && sleep 60)
integ-test.unstash(integtest-opensearch-dashboards-215)
Expand Down Expand Up @@ -265,7 +265,7 @@
uploadTestResults.stash({includes=messages/*, name=messages-DUMMY_STAGE_NAME})
integ-test.postCleanup()
postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})
integ-test.timeout({time=5, unit=HOURS}, groovy.lang.Closure)
integ-test.timeout({time=6, unit=HOURS}, groovy.lang.Closure)
integ-test.node(Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, groovy.lang.Closure)
integ-test.sh(echo reportsDashboards with index 4 will sleep 80 seconds to reduce load && sleep 80)
integ-test.unstash(integtest-opensearch-dashboards-215)
Expand Down Expand Up @@ -312,7 +312,7 @@
uploadTestResults.stash({includes=messages/*, name=messages-DUMMY_STAGE_NAME})
integ-test.postCleanup()
postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})
integ-test.timeout({time=5, unit=HOURS}, groovy.lang.Closure)
integ-test.timeout({time=6, unit=HOURS}, groovy.lang.Closure)
integ-test.node(Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, groovy.lang.Closure)
integ-test.sh(echo queryWorkbenchDashboards with index 5 will sleep 100 seconds to reduce load && sleep 100)
integ-test.unstash(integtest-opensearch-dashboards-215)
Expand Down Expand Up @@ -359,7 +359,7 @@
uploadTestResults.stash({includes=messages/*, name=messages-DUMMY_STAGE_NAME})
integ-test.postCleanup()
postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})
integ-test.timeout({time=5, unit=HOURS}, groovy.lang.Closure)
integ-test.timeout({time=6, unit=HOURS}, groovy.lang.Closure)
integ-test.node(Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, groovy.lang.Closure)
integ-test.sh(echo observabilityDashboards with index 6 will sleep 120 seconds to reduce load && sleep 120)
integ-test.unstash(integtest-opensearch-dashboards-215)
Expand Down
16 changes: 8 additions & 8 deletions tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/integ-test.jenkinsfile.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
integ-test.library({[email protected], retriever=null})
integ-test.pipeline(groovy.lang.Closure)
integ-test.credentials(jenkins-artifact-bucket-name)
integ-test.timeout({time=6, unit=HOURS})
integ-test.timeout({time=7, unit=HOURS})
integ-test.logRotator({daysToKeepStr=30})
integ-test.buildDiscarder(null)
integ-test.echo(Executing on agent [label:none])
Expand Down Expand Up @@ -89,7 +89,7 @@
integ-test.echo(Adding Component: queryWorkbenchDashboards)
integ-test.echo(Adding Component: observabilityDashboards)
integ-test.parallel({Run Integtest ganttChartDashboards=groovy.lang.Closure, Run Integtest indexManagementDashboards=groovy.lang.Closure, Run Integtest anomalyDetectionDashboards=groovy.lang.Closure, Run Integtest OpenSearch-Dashboards=groovy.lang.Closure, Run Integtest reportsDashboards=groovy.lang.Closure, Run Integtest queryWorkbenchDashboards=groovy.lang.Closure, Run Integtest observabilityDashboards=groovy.lang.Closure})
integ-test.timeout({time=5, unit=HOURS}, groovy.lang.Closure)
integ-test.timeout({time=6, unit=HOURS}, groovy.lang.Closure)
integ-test.node(Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, groovy.lang.Closure)
integ-test.sh(echo ganttChartDashboards with index 0 will sleep 0 seconds to reduce load && sleep 0)
integ-test.unstash(integtest-opensearch-dashboards-215)
Expand Down Expand Up @@ -136,7 +136,7 @@
uploadTestResults.stash({includes=messages/*, name=messages-DUMMY_STAGE_NAME})
integ-test.postCleanup()
postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})
integ-test.timeout({time=5, unit=HOURS}, groovy.lang.Closure)
integ-test.timeout({time=6, unit=HOURS}, groovy.lang.Closure)
integ-test.node(Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, groovy.lang.Closure)
integ-test.sh(echo indexManagementDashboards with index 1 will sleep 20 seconds to reduce load && sleep 20)
integ-test.unstash(integtest-opensearch-dashboards-215)
Expand Down Expand Up @@ -183,7 +183,7 @@
uploadTestResults.stash({includes=messages/*, name=messages-DUMMY_STAGE_NAME})
integ-test.postCleanup()
postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})
integ-test.timeout({time=5, unit=HOURS}, groovy.lang.Closure)
integ-test.timeout({time=6, unit=HOURS}, groovy.lang.Closure)
integ-test.node(Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, groovy.lang.Closure)
integ-test.sh(echo anomalyDetectionDashboards with index 2 will sleep 40 seconds to reduce load && sleep 40)
integ-test.unstash(integtest-opensearch-dashboards-215)
Expand Down Expand Up @@ -230,7 +230,7 @@
uploadTestResults.stash({includes=messages/*, name=messages-DUMMY_STAGE_NAME})
integ-test.postCleanup()
postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})
integ-test.timeout({time=5, unit=HOURS}, groovy.lang.Closure)
integ-test.timeout({time=6, unit=HOURS}, groovy.lang.Closure)
integ-test.node(Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, groovy.lang.Closure)
integ-test.sh(echo OpenSearch-Dashboards with index 3 will sleep 60 seconds to reduce load && sleep 60)
integ-test.unstash(integtest-opensearch-dashboards-215)
Expand Down Expand Up @@ -277,7 +277,7 @@
uploadTestResults.stash({includes=messages/*, name=messages-DUMMY_STAGE_NAME})
integ-test.postCleanup()
postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})
integ-test.timeout({time=5, unit=HOURS}, groovy.lang.Closure)
integ-test.timeout({time=6, unit=HOURS}, groovy.lang.Closure)
integ-test.node(Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, groovy.lang.Closure)
integ-test.sh(echo reportsDashboards with index 4 will sleep 80 seconds to reduce load && sleep 80)
integ-test.unstash(integtest-opensearch-dashboards-215)
Expand Down Expand Up @@ -324,7 +324,7 @@
uploadTestResults.stash({includes=messages/*, name=messages-DUMMY_STAGE_NAME})
integ-test.postCleanup()
postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})
integ-test.timeout({time=5, unit=HOURS}, groovy.lang.Closure)
integ-test.timeout({time=6, unit=HOURS}, groovy.lang.Closure)
integ-test.node(Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, groovy.lang.Closure)
integ-test.sh(echo queryWorkbenchDashboards with index 5 will sleep 100 seconds to reduce load && sleep 100)
integ-test.unstash(integtest-opensearch-dashboards-215)
Expand Down Expand Up @@ -371,7 +371,7 @@
uploadTestResults.stash({includes=messages/*, name=messages-DUMMY_STAGE_NAME})
integ-test.postCleanup()
postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})
integ-test.timeout({time=5, unit=HOURS}, groovy.lang.Closure)
integ-test.timeout({time=6, unit=HOURS}, groovy.lang.Closure)
integ-test.node(Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, groovy.lang.Closure)
integ-test.sh(echo observabilityDashboards with index 6 will sleep 120 seconds to reduce load && sleep 120)
integ-test.unstash(integtest-opensearch-dashboards-215)
Expand Down

0 comments on commit aefb420

Please sign in to comment.