X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Fautorelease-projects.yaml;h=877dc08d18a0ec59f47f0bdc88dbd6e42aa51755;hb=9d38db6bfdd4ec9179596003fe2bd0b97d6a56bc;hp=a9b0a373feba04013c82ff6ca58986bfd7d861b3;hpb=d7c3880fe4578a70a16e2237bb8be8a1742c0291;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index a9b0a373f..877dc08d1 100644
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -2,35 +2,25 @@
 - project:
     name: autorelease-projects
     jobs:
+      - autorelease-branch-cut
       - 'autorelease-generate-release-notes-{stream}'
       - 'autorelease-release-{stream}':
-          build-node: centos7-autorelease-8c-16g
+          build-node: centos7-autorelease-4c-16g
       - 'autorelease-update-validate-jobs-{stream}'
-      - 'autorelease-version-bump-{stream}'
+      - 'autorelease-version-bump-{stream}':
+          build-node: centos7-autorelease-4c-16g
       - '{project-name}-validate-autorelease-{stream}'
       - gerrit-tox-verify
 
-    # todo: After Carbon EOL remove next-release-tag and directy pass
-    # '{stream}' to autorelease-release-tag parameter
     stream:
-      - oxygen:
-          next-release-tag: '{stream}'
+      - fluorine:
           branch: 'master'
+          integration-test: fluorine
+          extra-mvn-opts: -P!karaf -Dsft.heap.max=4g
+      - oxygen:
+          branch: 'stable/oxygen'
           integration-test: oxygen
-          extra-mvn-opts: -Dsft.heap.max=4g
-      - nitrogen:
-          next-release-tag: '{stream}'
-          branch: 'stable/nitrogen'
-          integration-test: nitrogen
-          extra-mvn-opts: -Dsft.heap.max=4g
-      - carbon:
-          # Run once a week now that Nitrogen is released and Oxygen is in active development
-          cron: 'H 12 * * 0'
-          next-release-tag: '{stream}'
-          branch: 'stable/carbon'
-          integration-test: carbon
-          karaf-version: karaf3
-          extra-mvn-opts: -Dskip.karaf4.featureTest=true
+          extra-mvn-opts: -P!karaf -Dsft.heap.max=4g
 
     project: releng/autorelease
     project-name: autorelease