Merge "Remove packetcable carbon jobs"

[releng/builder.git] / jjb / autorelease / autorelease-projects.yaml

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index bedc14ba4b05c5a1723754d3246322affe92fc0b..4c8bef7b4f68758e4fcfb2b4b5922fa7f6ed8bcb 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -21,23 +21,17 @@
           integration-test: fluorine
           extra-mvn-opts: -P!karaf -Dsft.heap.max=4g
       - oxygen:
+          # Run once a week (Sunday) until Nitrogen-SR3 is out.
+          cron: 'H 12 * * 6'
           next-release-tag: '{stream}'
           branch: 'stable/oxygen'
           integration-test: oxygen
           extra-mvn-opts: -P!karaf -Dsft.heap.max=4g
       - nitrogen:
-          # Run once a week (Sunday) now that Fluorine branch is cut, and Oxygen is pending release
-          cron: 'H 12 * * 0'
           next-release-tag: '{stream}'
           branch: 'stable/nitrogen'
           integration-test: nitrogen
           extra-mvn-opts: -P!karaf -Dsft.heap.max=4g
-      - carbon:
-          next-release-tag: '{stream}'
-          branch: 'stable/carbon'
-          integration-test: carbon
-          karaf-version: karaf3
-          extra-mvn-opts: -P!karaf -Dskip.karaf4.featureTest=true
 
     project: releng/autorelease
     project-name: autorelease