From b2b0db9b5df96924368d1bb88785d5915003b6fb Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Thu, 20 Jun 2024 17:18:10 -0400 Subject: [PATCH] Increase osd integTest timeout to 6 hours for OSD core Signed-off-by: Peter Zhu --- .../opensearch-dashboards/integ-test.jenkinsfile | 4 ++-- ...integ-test-without-validation.jenkinsfile.txt | 16 ++++++++-------- .../integ-test.jenkinsfile.txt | 16 ++++++++-------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/jenkins/opensearch-dashboards/integ-test.jenkinsfile b/jenkins/opensearch-dashboards/integ-test.jenkinsfile index 913a2335d5..c8451c1c75 100644 --- a/jenkins/opensearch-dashboards/integ-test.jenkinsfile +++ b/jenkins/opensearch-dashboards/integ-test.jenkinsfile @@ -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 @@ -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"]) { 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 907b4b8d57..f6415cb0e2 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 @@ -3,7 +3,7 @@ integ-test.library({identifier=jenkins@6.5.0, 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]) @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) 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 ea853074dd..5c2f2d11a9 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 @@ -3,7 +3,7 @@ integ-test.library({identifier=jenkins@6.5.0, 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]) @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) @@ -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)