Reduce build retention to 40 for some builds (#26224)

apache · Apr 11, 2023 · d3f1acb · d3f1acb
1 parent 66c030b
commit d3f1acb
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 9 deletions.
diff --git a/.test-infra/jenkins/CommonJobProperties.groovy b/.test-infra/jenkins/CommonJobProperties.groovy
@@ -38,7 +38,8 @@ class CommonJobProperties {
       int defaultTimeout = 100,
       boolean allowRemotePoll = true,
       String jenkinsExecutorLabel = 'beam',
-      boolean cleanWorkspace = true) {
+      boolean cleanWorkspace = true,
+      int numBuildsToRetain = -1) {
     // GitHub project.
     context.properties {
       githubProjectUrl('https://github.com/apache/beam/')
@@ -53,6 +54,7 @@ class CommonJobProperties {
     // Discard old builds. Build records are only kept up to this number of days.
     context.logRotator {
       daysToKeep(30)
+      numToKeep(numBuildsToRetain)
     }
 
     // Source code management.

diff --git a/.test-infra/jenkins/PrecommitJobBuilder.groovy b/.test-infra/jenkins/PrecommitJobBuilder.groovy
@@ -59,6 +59,9 @@ class PrecommitJobBuilder {
    */
   boolean defaultPathTriggering = true
 
+  /** Number of builds to retain in history. */
+  int numBuildsToRetain = -1
+
   /**
    * Define a set of pre-commit jobs.
    *
@@ -129,7 +132,10 @@ class PrecommitJobBuilder {
       commonJobProperties.setTopLevelMainJobProperties(delegate,
           'master',
           timeoutMins,
-          allowRemotePoll) // needed for included regions PR triggering; see [JENKINS-23606]
+          allowRemotePoll,
+          'beam',
+          true,
+          numBuildsToRetain) // needed for included regions PR triggering; see [JENKINS-23606]
       steps {
         gradle {
           rootBuildScriptDir(commonJobProperties.checkoutDir)

diff --git a/.test-infra/jenkins/job_PostCommit_Go_ValidatesRunner_Flink.groovy b/.test-infra/jenkins/job_PostCommit_Go_ValidatesRunner_Flink.groovy
@@ -25,7 +25,7 @@ PostcommitJobBuilder.postCommitJob('beam_PostCommit_Go_VR_Flink',
       description('Runs Go integration tests on the Flink runner.')
 
       // Set common parameters.
-      commonJobProperties.setTopLevelMainJobProperties(delegate)
+      commonJobProperties.setTopLevelMainJobProperties(delegate, 'master', 100, true, 'beam', true, 40)
 
       // Gradle goals for this job.
       steps {

diff --git a/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Flink.groovy b/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Flink.groovy
@@ -31,7 +31,7 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_
 
       description('Runs the Nexmark suite on the Flink runner.')
 
-      commonJobProperties.setTopLevelMainJobProperties(delegate, 'master', 240, true, 'beam-perf')
+      commonJobProperties.setTopLevelMainJobProperties(delegate, 'master', 240, true, 'beam-perf', true, 40)
 
       commonJob(delegate, TriggeringContext.POST_COMMIT)
     }
@@ -41,7 +41,7 @@ PhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_Fl
 
       description('Runs the Nexmark suite on the Flink runner against a Pull Request, on demand.')
 
-      commonJobProperties.setTopLevelMainJobProperties(delegate, 'master', 240)
+      commonJobProperties.setTopLevelMainJobProperties(delegate, 'master', 240, true, 'beam', true, 40)
 
       commonJob(delegate, TriggeringContext.PR)
     }

diff --git a/.test-infra/jenkins/job_PostCommit_Python_Examples_Flink.groovy b/.test-infra/jenkins/job_PostCommit_Python_Examples_Flink.groovy
@@ -25,7 +25,7 @@ PostcommitJobBuilder.postCommitJob('beam_PostCommit_Python_Examples_Flink',
 
       description('Runs the Python Examples with Flink Runner')
 
-      commonJobProperties.setTopLevelMainJobProperties(delegate, 'master', 120)
+      commonJobProperties.setTopLevelMainJobProperties(delegate, 'master', 120, true, 'beam', true, 40)
 
       // Publish all test results to Jenkins
       publishers {

diff --git a/.test-infra/jenkins/job_PreCommit_Java.groovy b/.test-infra/jenkins/job_PreCommit_Java.groovy
@@ -93,7 +93,8 @@ PrecommitJobBuilder builder = new PrecommitJobBuilder(
       '^release/.*$',
     ],
     excludePathPatterns: excludePaths.collect {entry ->
-      "^sdks/java/" + entry + '/.*$'}
+      "^sdks/java/" + entry + '/.*$'},
+    numBuildsToRetain: 40
     )
 builder.build {
   publishers {

diff --git a/.test-infra/jenkins/job_PreCommit_Python.groovy b/.test-infra/jenkins/job_PreCommit_Python.groovy
@@ -30,7 +30,8 @@ PrecommitJobBuilder builder = new PrecommitJobBuilder(
     ],
     gradleSwitches: [
       '-Pposargs=\"--ignore=apache_beam/dataframe/ --ignore=apache_beam/examples/ --ignore=apache_beam/runners/ --ignore=apache_beam/transforms/\"' // All these tests are covered by different jobs.
-    ]
+    ],
+    numBuildsToRetain: 40
     )
 builder.build {
   // Publish all test results to Jenkins.

diff --git a/.test-infra/jenkins/job_PreCommit_SQL.groovy b/.test-infra/jenkins/job_PreCommit_SQL.groovy
@@ -29,7 +29,8 @@ PrecommitJobBuilder builder = new PrecommitJobBuilder(
     ], // spotless checked in job_PreCommit_Spotless
     triggerPathPatterns: [
       '^sdks/java/extensions/sql.*$',
-    ]
+    ],
+    numBuildsToRetain: 40
     )
 builder.build {
   publishers {