Merge "add lab path for volume option with joid"

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

diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml
index 5f77e8a..ed452a6 100644 (file)
--- a/jjb/octopus/octopus.yml
+++ b/jjb/octopus/octopus.yml
@@ -28,14 +28,6 @@
 - job-template:
     name: octopus-test
 
-    project-type: freestyle
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - shell: |
             echo "Hello world from octopus"
@@ -43,23 +35,14 @@
 - job-template:
     name: 'octopus-daily-{stream}'
 
-    node: master
-
     # Job template for daily builders
     #
     # Required Variables:
     #     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}'
@@ -88,16 +71,6 @@
 - job-template:
     name: 'octopus-verify-{stream}'
 
-    node: master
-
-    project-type: freestyle
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -135,20 +108,10 @@
 - job-template:
     name: 'octopus-merge-{stream}'
 
-    node: master
-
     # builder-merge job to run JJB update
     #
     # 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}'
@@ -161,7 +124,6 @@
             refspec: ''
             choosing-strategy: 'default'
 
-
     triggers:
         - gerrit:
             trigger-on:
@@ -179,7 +141,6 @@
         - shell:
             !include-raw ../opnfvdocs/docu-build.sh
 
-
 ########################
 ## parameter macros
 #########################