X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fpacketcable%2Fpacketcable.yaml;h=9022c073abbf6ff1bfbc8cc8c15da2c5591c7ec4;hb=e9d1cd864af58158ac11cae17714099e1a5731ba;hp=5e39a9e867843ea91b03aa1cccaa4476360bfc06;hpb=5dc8c48a0fa0b6cd840613d03b08f4cbb8285e35;p=releng%2Fbuilder.git

diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml
index 5e39a9e86..9022c073a 100644
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -2,17 +2,15 @@
 - project:
     name: packetcable-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: oxygen
     project: 'packetcable'
     project-name: 'packetcable'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -25,20 +23,21 @@
     email-upstream: '[packetcable]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68ca4a24655c
+
 - project:
     name: packetcable-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'packetcable'
     project-name: 'packetcable'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -51,21 +50,22 @@
     email-upstream: '[packetcable]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68ca4a24655c
+
 - project:
     name: packetcable-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'packetcable'
     project-name: 'packetcable'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -78,37 +78,13 @@
     email-upstream: '[packetcable]'
     archive-artifacts: ''
 
-- project:
-    name: packetcable-boron
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: boron
-    project: 'packetcable'
-    project-name: 'packetcable'
-    branch: 'stable/boron'
-    karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'packetcable-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[packetcable]'
-    archive-artifacts: ''
+    # Used by the release job
+    staging-profile-id: a68ca4a24655c
 
 - project:
     name: packetcable-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'packetcable'
     project-name: 'packetcable'
     branch: 'master'