Merge "Update Test jobs for ODL Neon SR1 Release"

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

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index 25cbca1dc9b00f088e6d585210da657e3825ebaf..36b12ad69b7741a6b4fc2f3b7235d66c8605a304 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -1,10 +1,10 @@
 ---
 - project:
-    name: groupbasedpolicy-neon
+    name: groupbasedpolicy-sodium
     jobs:
       - odl-maven-jobs
 
-    stream: neon
+    stream: sodium
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'master'
@@ -20,19 +20,20 @@
         sfc-merge-{stream},
         ovsdb-merge-{stream}
     email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96fbb93f95a76
 
 - project:
-    name: groupbasedpolicy-fluorine
+    name: groupbasedpolicy-neon
     jobs:
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean deploy findbugs:findbugs'
@@ -45,20 +46,20 @@
         sfc-merge-{stream},
         ovsdb-merge-{stream}
     email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96fbb93f95a76
 
 - project:
-    name: groupbasedpolicy-oxygen
+    name: groupbasedpolicy-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean deploy findbugs:findbugs'
@@ -71,6 +72,7 @@
         sfc-merge-{stream},
         ovsdb-merge-{stream}
     email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96fbb93f95a76
@@ -86,6 +88,7 @@
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean deploy findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    disable-job: true
 
 - project:
     name: groupbasedpolicy-view