Remove all logrotate calls

[ci-management.git] / jjb / ci-management / ci-management-jobs.yaml

diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml
index cef4c9b..291309a 100644 (file)
--- a/jjb/ci-management/ci-management-jobs.yaml
+++ b/jjb/ci-management/ci-management-jobs.yaml
@@ -24,7 +24,7 @@
     node: jjb
     concurrent: true
 
-    logrotate:
+    build-discarder:
       daysToKeep: 30
       numToKeep: 10
       artifactDaysToKeep: -1
@@ -35,10 +35,11 @@
           project: '{project}'
 
     scm:
-      - gerrit-trigger-scm:
+      - gerrit-trigger-scm-recursive:
           credentials-id: 'jenkins-gerrit-credentials'
           refspec: '$GERRIT_REFSPEC'
           choosing-strategy: 'gerrit'
+          submodule-recursive: true
 
     wrappers:
       - fdio-infra-wrappers:
@@ -67,7 +68,7 @@
     project-type: freestyle
     node: jjb
 
-    logrotate:
+    build-discarder:
       daysToKeep: 30
       numToKeep: 40
       artifactDaysToKeep: -1
@@ -78,10 +79,11 @@
           project: '{project}'
 
     scm:
-      - gerrit-trigger-scm:
+      - gerrit-trigger-scm-recursive:
           credentials-id: 'jenkins-gerrit-credentials'
-          refspec: ''
-          choosing-strategy: 'default'
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+          submodule-recursive: true
 
     wrappers:
       - fdio-infra-wrappers:
@@ -128,6 +130,7 @@
           branches:
             - '$GERRIT_BRANCH'
           choosing-strategy: 'gerrit'
+          submodule-recursive: true
 
     wrappers:
       - fdio-infra-wrappers:
@@ -197,6 +200,7 @@
           branches:
             - '$GERRIT_BRANCH'
           choosing-strategy: 'default'
+          submodule-recursive: true
 
     wrappers:
       - fdio-infra-wrappers: