X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=jjb%2Fpacketcable%2Fpacketcable.yaml;h=ebf860f78bd1baf7dc91c45a2eb2a818c89da504;hb=0e0e34daa29f5cd386428cc72571b1e3dee6abfa;hp=52e0376c979e03029b0a32b97dbbf80a50985183;hpb=60ece105911dfac245dd20f4b006b6b09a9d10f1;p=releng%2Fbuilder.git

diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml
index 52e0376c9..ebf860f78 100644
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -1,82 +1,35 @@
 ---
 - project:
-    name: packetcable-oxygen
+    name: packetcable-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'packetcable'
     project-name: 'packetcable'
     branch: 'master'
-    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-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
-
-    stream: nitrogen
-    project: 'packetcable'
-    project-name: 'packetcable'
-    branch: 'stable/nitrogen'
-    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-carbon
+    name: packetcable-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'packetcable'
     project-name: 'packetcable'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     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
@@ -84,10 +37,9 @@
 - project:
     name: packetcable-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'packetcable'
     project-name: 'packetcable'
     branch: 'master'
     mvn-settings: 'packetcable-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'