X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fsfc%2Fsfc-python.yaml;h=7a3b3f87424c3c9060127f222337fb637831a35b;hb=d976e4d63709a89ded048679a42dd05494890bf6;hp=b123316af5b23fcf86951a4939eb23f327480735;hpb=52db98a7612367d538316c760d9141f9160d0aea;p=releng%2Fbuilder.git

diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml
index b123316af..7a3b3f874 100644
--- a/jjb/sfc/sfc-python.yaml
+++ b/jjb/sfc/sfc-python.yaml
@@ -3,14 +3,17 @@
     jobs:
         - 'sfc-verify-python-{stream}'
 
-    # stream:    branch with - in place of / (eg. stable-helium)
-    # branch:    branch (eg. stable/helium)
+    # stream:    release stream (eg. stable-boron or beryllium)
+    # branch:    git branch (eg. stable/boron or master)
     stream:
-        - master:
+        - carbon:
             branch: 'master'
+        - boron:
+            branch: 'stable/boron'
+        - beryllium:
+            branch: 'stable/beryllium'
 
     project: 'sfc'
-    jdk: 'openjdk7'
 
 - job-template:
     name: 'sfc-verify-python-{stream}'
@@ -20,60 +23,39 @@
     # The purpose of this job template is to setup a ODL verify job
     #
     # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable-helium)
-    #     branch:    branch (eg. stable/helium)
+    #     stream:    release stream (eg. stable-boron or beryllium)
+    #     branch:    git branch (eg. stable/boron or master)
 
     project-type: freestyle
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
     concurrent: true
-    jdk: '{jdk}'
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit:
-            server-name: 'OpenDaylight'
-            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: 'sfc'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                file-paths:
-                    - compare-type: ANT
-                      pattern: sfc-py/**
+        - gerrit-trigger-patch-submitted:
+            server: '{server-name}'
+            project: '{project}'
+            branch: '{branch}'
+            files: 'sfc-py/**'
 
     builders:
         - shell: |
@@ -81,10 +63,11 @@
             source $WORKSPACE/venv-tox/bin/activate
             pip install tox argparse
             tox --version
-            cd sfc-py
+            cd $WORKSPACE/sfc-py
             tox
+            ./jenkins_build_package.sh
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[sfc]'
-