Merge "Fix for Pike/Queens Jobs"

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

diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml
index 2b9310d92f276be39012670c13fc09e96ade224e..bfe6ef9e04104859b60a69dc652270676d6461a5 100644 (file)
--- a/jjb/sfc/sfc-python.yaml
+++ b/jjb/sfc/sfc-python.yaml
@@ -4,32 +4,23 @@
     jobs:
       - 'sfc-verify-python-{stream}'
 
-    # stream:    release stream (eg. stable-boron or beryllium)
-    # branch:    git branch (eg. stable/boron or master)
     stream:
-      - nitrogen:
+      - fluorine:
           branch: 'master'
-          jre: 'openjdk8'
+      - oxygen:
+          branch: 'stable/oxygen'
+      - nitrogen:
+          branch: 'stable/nitrogen'
       - carbon:
           branch: 'stable/carbon'
-      - boron:
-          branch: 'stable/boron'
 
     project: 'sfc'
 
 - job-template:
     name: 'sfc-verify-python-{stream}'
 
-    # Job template for ODL verify jobs
-    #
-    # The purpose of this job template is to setup a ODL verify job
-    #
-    # Required Variables:
-    #     stream:    release stream (eg. stable-boron or beryllium)
-    #     branch:    git branch (eg. stable/boron or master)
-
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
     concurrent: true
 
     properties:
@@ -55,7 +46,7 @@
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: 'sfc-py/**'
@@ -64,7 +55,8 @@
       - shell: |
           virtualenv $WORKSPACE/venv-tox
           source $WORKSPACE/venv-tox/bin/activate
-          pip install tox argparse
+          PYTHON="$WORKSPACE/venv-tox/bin/python"
+          $PYTHON -m pip install tox argparse
           tox --version
           cd $WORKSPACE/sfc-py
           tox