X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Fautorelease-projects.yaml;h=bedc14ba4b05c5a1723754d3246322affe92fc0b;hb=b28d048dd23e76255ee6d865be500a940e3a66de;hp=a90a1ddc3d48485fb805cace0486295b0b3d3105;hpb=c2640368dd057a61fbe81a36e4871ca8aaf57faf;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index a90a1ddc3..bedc14ba4 100644
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -2,39 +2,46 @@
 - project:
     name: autorelease-projects
     jobs:
+      - autorelease-branch-cut
       - 'autorelease-generate-release-notes-{stream}'
-      - 'autorelease-release-{stream}'
+      - 'autorelease-release-{stream}':
+          build-node: centos7-autorelease-4c-16g
       - 'autorelease-update-validate-jobs-{stream}'
-      - 'autorelease-version-bump-{stream}'
-      - '{project-name}-validate-autorelease-{stream}':
-          build-node: centos7-java-builder-2c-8g
+      - '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:
+      - fluorine:
           next-release-tag: '{stream}'
           branch: 'master'
+          integration-test: fluorine
+          extra-mvn-opts: -P!karaf -Dsft.heap.max=4g
+      - oxygen:
+          next-release-tag: '{stream}'
+          branch: 'stable/oxygen'
           integration-test: oxygen
-          extra-mvn-opts: -Dsft.heap.max=4g
+          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: -Dsft.heap.max=4g
+          extra-mvn-opts: -P!karaf -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 -Dskip.karaf4.featureTest=true
 
     project: releng/autorelease
     project-name: autorelease
-    build-node: centos7-java-builder-2c-8g
+    build-node: centos7-builder-2c-8g
     # Before adding more here, beware of https://jira.linuxfoundation.org/browse/RELENG-280
     archive-artifacts: >
         **/*.prop