Merge "Update SFC netvirt CSIT with fluorine and queens"

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

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index a9b0a373feba04013c82ff6ca58986bfd7d861b3..2c6fd2d0d400dea261c2fdfe584b2bce799f38cb 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -2,35 +2,44 @@
 - 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:
+      - fluorine:
           next-release-tag: '{stream}'
           branch: 'master'
+          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: -Dsft.heap.max=4g
+          extra-mvn-opts: -P!karaf -Dsft.heap.max=4g
       - nitrogen:
           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'
+          # Run once a week (Saturday) now that Fluorine branch is cut, and Oxygen is pending release
+          cron: 'H 12 * * 6'
           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