Merge "new job to run tempest tests with openstack+odl"

[releng/builder.git] / jjb / sfc / sfc-python.yaml

diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml
index 483e81a79adbf6114180c859adcd75b58136f9d4..8839563fb3554abcd910ee5136f7107885b6b73d 100644 (file)
--- a/jjb/sfc/sfc-python.yaml
+++ b/jjb/sfc/sfc-python.yaml
@@ -3,10 +3,10 @@
     jobs:
         - 'sfc-verify-python-{stream}'
 
-    # stream:    branch with - in place of / (eg. stable-helium)
-    # branch:    branch (eg. stable/helium)
+    # stream:    release stream (eg. stable-lithium or beryllium)
+    # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
 
     project: 'sfc'
@@ -20,8 +20,8 @@
     # 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-lithium or beryllium)
+    #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: freestyle
     node: dynamic_verify
@@ -49,7 +49,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit:
@@ -76,8 +77,13 @@
 
     builders:
         - shell: |
-            cd sfc-py
+            virtualenv $WORKSPACE/venv-tox
+            source $WORKSPACE/venv-tox/bin/activate
+            pip install tox argparse
+            tox --version
+            cd $WORKSPACE/sfc-py
             tox
+            ./jenkins_build_package.sh
 
     publishers:
         - email-notification: