Merge "Remove ocpplugin carbon jobs"

[releng/builder.git] / jjb / openflowplugin / openflowplugin.yaml

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index f3236868905dfeb732795cacbaad999e650b4d7c..07582f1f8d72b63f2c0d12a8bd9949cc7e6e9fb2 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -1,43 +1,43 @@
 ---
 - project:
-    name: openflowplugin-oxygen
+    name: openflowplugin-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
     mvn-settings: 'openflowplugin-settings'
     mvn-goals: 'clean deploy javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    build-timeout: 90
     dependencies: >
         odlparent-merge-{stream},
         yangtools-merge-{stream},
         controller-merge-{stream},
         openflowjava-merge-{stream}
     email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
-    archive-artifacts: 'model/*/target/site/**'
 
     # Used by the release job
     staging-profile-id: a68a76dc1b44c
 
 - project:
-    name: openflowplugin-nitrogen
+    name: openflowplugin-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'openflowplugin'
     project-name: 'openflowplugin'
-    branch: 'stable/nitrogen'
+    branch: 'stable/oxygen'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
     mvn-settings: 'openflowplugin-settings'
     mvn-goals: 'clean deploy javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -47,24 +47,23 @@
         controller-merge-{stream},
         openflowjava-merge-{stream}
     email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
-    archive-artifacts: 'model/*/target/site/**'
 
     # Used by the release job
     staging-profile-id: a68a76dc1b44c
 
 - project:
-    name: openflowplugin-carbon
+    name: openflowplugin-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'openflowplugin'
     project-name: 'openflowplugin'
-    branch: 'stable/carbon'
-    karaf-version: 'karaf3'
+    branch: 'stable/nitrogen'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
     mvn-settings: 'openflowplugin-settings'
     mvn-goals: 'clean deploy javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -74,7 +73,6 @@
         controller-merge-{stream},
         openflowjava-merge-{stream}
     email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
-    archive-artifacts: 'model/*/target/site/**'
 
     # Used by the release job
     staging-profile-id: a68a76dc1b44c
@@ -86,6 +84,8 @@
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
     mvn-settings: 'openflowplugin-settings'
     mvn-goals: 'clean deploy javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'