Merge "Remove builder docs carbon jobs"

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

diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml
index 893de90b903eb590f186a36944a6e854917635e7..ed16d18cba618c2b607fc06007a6691c43fcae8f 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -1,12 +1,10 @@
 ---
 - project:
-    name: packetcable-oxygen
+    name: packetcable-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'packetcable'
     project-name: 'packetcable'
     branch: 'master'
@@ -14,48 +12,42 @@
     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
+    name: packetcable-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'packetcable'
     project-name: 'packetcable'
-    branch: 'stable/nitrogen'
+    branch: 'stable/oxygen'
     mvn-settings: 'packetcable-settings'
     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-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'packetcable'
     project-name: 'packetcable'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/nitrogen'
     mvn-settings: 'packetcable-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[packetcable]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68ca4a24655c