Merge "Increase ocata packer timeout from 60m to 75m"

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

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index 4ac606a6b6a1dd17223170e1478e9c4b655787d6..dcf6c8ccc73d56e50ac831308f084c95a24c3d0d 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -2,12 +2,9 @@
 - project:
     name: groupbasedpolicy-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'groupbasedpolicy'
@@ -21,6 +18,7 @@
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean install findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    build-timeout: 90
     dependencies: >
         openflowjava-merge-{stream},
         openflowplugin-merge-{stream},
@@ -30,14 +28,15 @@
     email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fbb93f95a76
+
 - project:
     name: groupbasedpolicy-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'groupbasedpolicy'
@@ -60,14 +59,15 @@
     email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fbb93f95a76
+
 - project:
     name: groupbasedpolicy-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'groupbasedpolicy'
@@ -91,10 +91,13 @@
     email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fbb93f95a76
+
 - project:
     name: groupbasedpolicy-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'master'