X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docs%2Fjenkins-job-builder%2Fopnfv-jjb-usage.rst;h=8e4a1a8316357b659318af8eb986c60e4004f96d;hb=c4cf3867ac5ebaf6667c52ddf1d47e95c920a947;hp=aabfda7aef1bce238de3b5ce2467272015a4be77;hpb=1df5076a99b5b74a0e8500d4e69fdc109a8213bc;p=releng.git

diff --git a/docs/jenkins-job-builder/opnfv-jjb-usage.rst b/docs/jenkins-job-builder/opnfv-jjb-usage.rst
index aabfda7ae..8e4a1a831 100644
--- a/docs/jenkins-job-builder/opnfv-jjb-usage.rst
+++ b/docs/jenkins-job-builder/opnfv-jjb-usage.rst
@@ -1,3 +1,12 @@
+.. image:: ../etc/opnfv-logo.png
+  :height: 40
+  :width: 200
+  :alt: OPNFV
+  :align: left
+
+|
+|
+
 Creating/Configuring/Verifying Jenkins Jobs
 ============================================
 
@@ -36,136 +45,149 @@ The verify and merge jobs are retriggerable in Gerrit by simply leaving a commen
 
 You can add below persons as reviewers to your patch in order to get it reviewed and submitted.
 
-* Ulrich Kleber (Ulrich.Kleber@huawei.com)
-* Fatih Degirmenci (fatih.degirmenci@ericsson.com)
-* Xinyu Zhao(Jerry) (zhaoxinyu@huawei.com)
+* fatih.degirmenci@ericsson.com
+* agardner@linuxfoundation.org
+* trozet@redhat.com
+* morgan.richomme@orange.com
+* vlaza@cloudbasesolutions.com
+* matthew.lijun@huawei.com
+* pbandzi@cisco.com
+* jose.lausuch@ericsson.com
+* koffirodrigue@gmail.com
+* r-mibu@cq.jp.nec.com
 
 Or just email a request for submission to opnfv-helpdesk@rt.linuxfoundation.org
 
 The Current merge and verify jobs for jenkins job builder as pulled from the repo::
 
- - project:
-    name: builder-jobs
-    jobs:
-        - 'builder-verify-jjb'
-        - 'builder-merge'
+**releng-jobs.yaml**:
 
-    project: 'releng'
+.. code-block:: bash
 
+ - project:
+     name: builder-jobs
+     jobs:
+         - 'builder-verify-jjb'
+         - 'builder-merge'
+ 
+     project: 'releng'
+ 
  - job-template:
-    name: builder-verify-jjb
-
-    project-type: freestyle
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: 'master'
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
-    triggers:
-        - gerrit:
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'false'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
-                - draft-published-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: 'releng'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/master'
-                file-paths:
-                    - compare-type: ANT
-                      pattern: jjb/**
-                    - compare-type: ANT
-                      pattern: jjb-templates/**
-
-
-    builders:
-        - shell: |
-            source /opt/virtualenv/jenkins-job-builder/bin/activate
-            jenkins-jobs test /opt/jenkins-ci/builder/
-
+     name: builder-verify-jjb
+ 
+     node: master
+ 
+     project-type: freestyle
+ 
+     logrotate:
+         daysToKeep: 30
+         numToKeep: 10
+         artifactDaysToKeep: -1
+         artifactNumToKeep: -1
+ 
+     parameters:
+         - project-parameter:
+             project: '{project}'
+         - gerrit-parameter:
+             branch: 'master'
+     scm:
+         - gerrit-trigger-scm:
+             credentials-id: '{ssh-credentials}'
+             refspec: '$GERRIT_REFSPEC'
+             choosing-strategy: 'gerrit'
+ 
+     wrappers:
+         - ssh-agent-credentials:
+             user: '{ssh-credentials}'
+ 
+     triggers:
+         - gerrit:
+             trigger-on:
+                 - patchset-created-event:
+                     exclude-drafts: 'false'
+                     exclude-trivial-rebase: 'false'
+                     exclude-no-code-change: 'false'
+                 - draft-published-event
+                 - comment-added-contains-event:
+                     comment-contains-value: 'recheck'
+                 - comment-added-contains-event:
+                     comment-contains-value: 'reverify'
+             projects:
+               - project-compare-type: 'ANT'
+                 project-pattern: 'releng'
+                 branches:
+                   - branch-compare-type: 'ANT'
+                     branch-pattern: '**/master'
+                 file-paths:
+                     - compare-type: ANT
+                       pattern: jjb/**
+                     - compare-type: ANT
+                       pattern: jjb-templates/**
+ 
+ 
+     builders:
+         - shell:
+             !include-raw verify-releng
+ 
  - job-template:
-    name: 'builder-merge'
-
-    # 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}'
-        - gerrit-parameter:
-            branch: 'master'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
-
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
-    triggers:
-        - gerrit:
-            trigger-on:
-                - change-merged-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'remerge'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: 'releng'
-                branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
-                file-paths:
-                    - compare-type: ANT
-                      pattern: jjb/**
-
-    builders:
-        - shell: |
-                source /opt/virtualenv/jenkins-job-builder/bin/activate
-                cd /opt/jenkins-ci/releng
-                git pull
-                jenkins-jobs update --delete-old jjb/
-
-
-
-**Documentation tracking**
+     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}'
+         - gerrit-parameter:
+             branch: 'master'
+ 
+     scm:
+         - gerrit-trigger-scm:
+             credentials-id: '{ssh-credentials}'
+             refspec: ''
+             choosing-strategy: 'default'
+ 
+     wrappers:
+         - ssh-agent-credentials:
+             user: '{ssh-credentials}'
+ 
+     triggers:
+         - gerrit:
+             trigger-on:
+                 - change-merged-event
+                 - comment-added-contains-event:
+                     comment-contains-value: 'remerge'
+             projects:
+               - project-compare-type: 'ANT'
+                 project-pattern: 'releng'
+                 branches:
+                     - branch-compare-type: 'ANT'
+                       branch-pattern: '**/master'
+                 file-paths:
+                     - compare-type: ANT
+                       pattern: jjb/**
+ 
+     builders:
+         - shell: |
+                 source /opt/virtualenv/jenkins-job-builder/bin/activate
+                 cd /opt/jenkins-ci/releng
+                 git pull
+                 jenkins-jobs update --delete-old jjb/
+ 
+ 
+
 
 Revision: _sha1_
 
-Build date:  _date_
+Build date: |today|