Remove unsupported Beryllium jobs

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

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index e61a0fe5a99bb9afebc6dfc42206dafde54690bf..293b6c60f4d3fb3e4653318b325095a0ecc9ad40 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -3,7 +3,7 @@
     name: autorelease-projects
     jobs:
       - 'autorelease-release-{stream}'
-      - 'autorelease-generate-release-notes-{stream}'
+      - autorelease-version-bump-{stream}
 
     stream:
       - nitrogen:
@@ -11,6 +11,7 @@
           branch: 'master'
           jdk: 'openjdk8'
           integration-test: nitrogen
+          karaf-version: karaf3
       - carbon:
           next-release-tag: Carbon
           branch: 'stable/carbon'
@@ -24,14 +25,6 @@
           jdk: 'openjdk8'
           integration-test: boron
           karaf-version: karaf3
-      - beryllium:
-          # Only run once a week since Beryllium is in maintenance mode
-          cron: 'H H * * 0'
-          next-release-tag: Beryllium-SR5
-          branch: 'stable/beryllium'
-          jdk: 'openjdk7'
-          integration-test: beryllium
-          karaf-version: karaf3
 
     project: 'releng/autorelease'
     archive-artifacts: >
@@ -41,6 +34,28 @@
         patches.tar.gz
         error.log.gz
 
+
+- project:
+    name: autorelease-release-notes
+    jobs:
+      - 'autorelease-generate-release-notes-{stream}'
+
+    stream:
+      - nitrogen:
+          branch: 'master'
+          jdk: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jdk: 'openjdk8'
+      - boron:
+          branch: 'stable/boron'
+          jdk: 'openjdk8'
+
+    project: 'releng/autorelease'
+    archive-artifacts: >
+        **/*.log
+
+
 ###
 # TODO: Remove this job once guava21 testing is complete
 ###