Merge "Strip include-raw prefix for script files"

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

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index aad0b09e6d6d0693d9eeabf05b6bf8182c7fd98c..c47747fbb54bb363186d16b6ddd544831eb18efd 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -6,15 +6,18 @@
       - 'opflex-merge-{stream}'
 
     stream:
-      - carbon:
+      - oxygen:
           branch: 'master'
+          jdk: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jdk: openjdk8
+      - carbon:
+          branch: 'stable/carbon'
           jdk: openjdk8
       - boron:
           branch: 'stable/boron'
           jdk: openjdk8
-      - beryllium:
-          branch: 'stable/beryllium'
-          jdk: openjdk8
 
     project: 'opflex'
     archive-artifacts: '**/*.tar.gz'
@@ -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}'
@@ -82,8 +85,7 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[opflex]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: 'opflex-merge-{stream}'
@@ -127,5 +129,4 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[opflex]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish