Update groupbasedpolicy jobs

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

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index 06a1cc5f9e0255ed53b6960997269fe1e89161f1..489745e1cf215a3e580aaa2b2c85819daf8ae43c 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -1,11 +1,11 @@
 ---
 - project:
-    name: groupbasedpolicy-phosphorus
+    name: groupbasedpolicy-master
     jobs:
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: phosphorus
+    stream: master
     project: "groupbasedpolicy"
     project-name: "groupbasedpolicy"
     branch: "master"
@@ -28,64 +28,6 @@
     # Used by the release job
     staging-profile-id: 96fbb93f95a76
 
-- project:
-    name: groupbasedpolicy-silicon
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: silicon
-    project: "groupbasedpolicy"
-    project-name: "groupbasedpolicy"
-    branch: "stable/silicon"
-    build-node: centos7-builder-2c-8g
-    mvn-settings: "groupbasedpolicy-settings"
-    mvn-goals: "-U clean deploy findbugs:findbugs"
-    mvn-opts: "-Xmx1024m"
-    build-timeout: 90
-    dependencies: >
-      openflowjava-merge-{stream},
-      openflowplugin-merge-{stream},
-      neutron-merge-{stream},
-      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-aluminium
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: aluminium
-    project: "groupbasedpolicy"
-    project-name: "groupbasedpolicy"
-    branch: "stable/aluminium"
-    build-node: centos7-builder-2c-8g
-    mvn-settings: "groupbasedpolicy-settings"
-    mvn-goals: "-U clean deploy findbugs:findbugs"
-    mvn-opts: "-Xmx1024m"
-    build-timeout: 90
-    dependencies: >
-      openflowjava-merge-{stream},
-      openflowplugin-merge-{stream},
-      neutron-merge-{stream},
-      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-release-management
     jobs: