Remove traces of Boron logic

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

diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml
index d61f6b79baa4550a407f1c7f2159e343f178e1f3..1e091f525d1d9fd2df72a1e64876778039304c1f 100644 (file)
--- a/jjb/sfc/sfc-python.yaml
+++ b/jjb/sfc/sfc-python.yaml
@@ -4,29 +4,21 @@
     jobs:
       - 'sfc-verify-python-{stream}'
 
-    # stream:    release stream (eg. stable-boron or beryllium)
-    # branch:    git branch (eg. stable/boron or master)
     stream:
-      - carbon:
+      - oxygen:
           branch: 'master'
-      - boron:
-          branch: 'stable/boron'
-      - beryllium:
-          branch: 'stable/beryllium'
+          jdk: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
 
     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
     concurrent: true
@@ -63,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