X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-jobs.yaml;h=d73ef50b7ba5d4649d1f78ec2721e5a76e3161e4;hb=cbc32fd99926ea20df148832776ec15a034f7f02;hp=19c6bab4f83279e542ce71ec1052434938cc084f;hpb=f3c923758ff758ba427377e1095d6436813a09a2;p=releng.git

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 19c6bab4f..d73ef50b7 100644
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -3,22 +3,13 @@
     jobs:
         - 'builder-verify-jjb'
         - 'builder-merge'
+        - 'artifacts-api'
 
     project: 'releng'
 
 - 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 +21,6 @@
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -57,30 +44,25 @@
                       pattern: jjb/**
                     - compare-type: ANT
                       pattern: jjb-templates/**
+                    - compare-type: ANT
+                      pattern: utils/**
 
 
     builders:
-        - shell: |
-            source /opt/virtualenv/jenkins-job-builder/bin/activate
-            jenkins-jobs test jjb/
+        - shell:
+            !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}'
@@ -93,10 +75,6 @@
             refspec: ''
             choosing-strategy: 'default'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -112,6 +90,8 @@
                 file-paths:
                     - compare-type: ANT
                       pattern: jjb/**
+                    - compare-type: ANT
+                      pattern: utils/**
 
     builders:
         - shell: |
@@ -120,3 +100,25 @@
                 git pull
                 jenkins-jobs update --delete-old jjb/
 
+- job-template:
+    name: 'artifacts-api'
+
+    # Generate and upload the JSON file to used for artifacts site
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: 'master'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            choosing-strategy: 'default'
+
+    triggers:
+        - timed: '@hourly'
+
+    builders:
+        - build-and-upload-artifacts-json-api