fuel: Run os-od_l2-nofeature-ha with ODL Be on Ericsson POD2

[releng.git] / jjb / releng-jobs.yaml

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index d732b1f..0b36f07 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -9,16 +9,6 @@
 - job-template:
     name: builder-verify-jjb
 
-    node: master
-
-    project-type: freestyle
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -30,10 +20,6 @@
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -59,32 +45,23 @@
                       pattern: jjb-templates/**
                     - compare-type: ANT
                       pattern: utils/**
-                forbidden-file-paths:
-                    - compare-type: ANT
-                      pattern: docs/**
 
 
     builders:
         - shell:
-            !include-raw verify-releng
+            !include-raw: verify-releng
+
+    publishers:
+        - archive-artifacts:
+            artifacts: 'job_output/*'
 
 - job-template:
     name: 'builder-merge'
 
-    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}'
@@ -97,10 +74,6 @@
             refspec: ''
             choosing-strategy: 'default'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -118,9 +91,6 @@
                       pattern: jjb/**
                     - compare-type: ANT
                       pattern: utils/**
-                forbidden-file-paths:
-                    - compare-type: ANT
-                      pattern: docs/**
 
     builders:
         - shell: |