jjb: use default logrotate setting in all projects

[releng.git] / jjb / vnf_forwarding_graph / vnf_forwarding_graph.yml

diff --git a/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml b/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml
index fb0da01..de63c4e 100644 (file)
--- a/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml
+++ b/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml
@@ -2,7 +2,7 @@
     name: vnf_forwarding_graph
     jobs:
         - 'vnf_forwarding_graph-test'
-        - 'vnf_forwarding_graph-daily-master'
+        - 'vnf_forwarding_graph-daily-{stream}'
         - 'vnf_forwarding_graph-merge'
         - 'vnf_forwarding_graph-verify'
 
@@ -18,20 +18,12 @@
 - job-template:
     name: vnf_forwarding_graph-test
 
-    project-type: freestyle
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - shell: |
             echo "Hello world from vnf_forwarding_graph"
 
 - job-template:
-    name: 'vnf_forwarding_graph-daily-master'
+    name: 'vnf_forwarding_graph-daily-{stream}'
 
     # Job template for daily builders
     #
@@ -39,15 +31,8 @@
     #     stream:    branch with - in place of / (eg. stable)
     #     branch:    branch (eg. stable)
 
-    project-type: freestyle
     varsetabove: '{somevar}'
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -58,10 +43,6 @@
             refspec: ''
             branch: '{branch}'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - timed: 'H H * * *'
 
@@ -80,14 +61,6 @@
 - job-template:
     name: 'vnf_forwarding_graph-verify'
 
-    project-type: freestyle
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -99,10 +72,6 @@
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -135,14 +104,6 @@
     #
     # This job's purpose is to update all the JJB
 
-    project-type: freestyle
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -155,10 +116,6 @@
             refspec: ''
             choosing-strategy: 'default'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -178,8 +135,3 @@
             find .
             echo "merge logic goes here"
 
-
-
-
-
-