X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ftransportpce%2Ftransportpce.yaml;h=c1602ba26f538243bee4eaadc8c8dceb3970a84b;hb=6111b67d87bb22cec768b8caca80430d0a87094c;hp=d424f796150c5693561a3dab64a2f7f5d76ea086;hpb=958a3b1043093fc94bc2c50896e20b96584863fe;p=releng%2Fbuilder.git

diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml
index d424f7961..c1602ba26 100644
--- a/jjb/transportpce/transportpce.yaml
+++ b/jjb/transportpce/transportpce.yaml
@@ -2,84 +2,68 @@
 - project:
     name: transportpce-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     project: 'transportpce'
     project-name: 'transportpce'
     stream: oxygen
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'transportpce-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[transportpce] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a6927323fa3d4
+
 - project:
     name: transportpce-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     project: 'transportpce'
     project-name: 'transportpce'
     stream: nitrogen
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'transportpce-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[transportpce] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a6927323fa3d4
+
 - project:
     name: transportpce-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     project: 'transportpce'
     project-name: 'transportpce'
     stream: carbon
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'transportpce-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[transportpce] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a6927323fa3d4
+
 - project:
     name: transportpce-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'transportpce'
     project-name: 'transportpce'
     branch: 'master'
     mvn-settings: 'transportpce-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'