Remove mvn-goals for projects that use default

[releng/builder.git] / jjb / honeycomb / vbd / vbd.yaml

diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml
index 3af61b89c9d6093b709d77c6f445cc63be190d9a..3c93910c83ad9f7557a14b5857dd9cbadbcaea7d 100644 (file)
--- a/jjb/honeycomb/vbd/vbd.yaml
+++ b/jjb/honeycomb/vbd/vbd.yaml
@@ -2,11 +2,9 @@
 - project:
     name: vbd-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}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'honeycomb/vbd'
@@ -18,20 +16,20 @@
       - mvn33:
           mvn-version: 'mvn33'
     mvn-settings: 'honeycomb-vbd-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[vbd]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fc362c36862
+
 - project:
     name: vbd-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: 'honeycomb/vbd'
@@ -43,20 +41,20 @@
       - mvn33:
           mvn-version: 'mvn33'
     mvn-settings: 'honeycomb-vbd-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[vbd]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fc362c36862
+
 - project:
     name: vbd-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: 'honeycomb/vbd'
@@ -69,19 +67,20 @@
       - mvn33:
           mvn-version: 'mvn33'
     mvn-settings: 'honeycomb-vbd-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[vbd]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fc362c36862
+
 - project:
     name: vbd-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'honeycomb/vbd'
     project-name: 'vbd'
     branch: 'master'
     mvn-settings: 'honeycomb-vbd-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'