Merge changes from topic 'refactoring'

[releng/builder.git] / jjb / opflex / opflex-custom.yaml

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index fb2c643ce36dd9bd8ee3d804709464f51b41c153..6d2699c8860f1b8a698705ef4c6c5ff49d003631 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -6,8 +6,11 @@
       - 'opflex-merge-{stream}'
 
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
+          jdk: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
           jdk: openjdk8
       - carbon:
           branch: 'stable/carbon'
@@ -35,7 +38,7 @@
       - copyartifact:
           project: opflex-openvswitch_tgz-{stream}
           flatten: true
-      - shell: !include-raw-escape: include-raw-opflex-build.sh
+      - shell: !include-raw-escape: opflex-build.sh
 
 - job-template:
     name: 'opflex-verify-{stream}'
@@ -100,7 +103,7 @@
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          artifacts: ''
 
     scm:
       - gerrit-trigger-scm: