Merge "Trigger apex netvirt csit job on genius patches"

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

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 9e6bc1e47f876b997b66e60e68d4f19b42216872..48faad2e1bbbd0643ae3885b094e3eeccaaacc77 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -2,36 +2,33 @@
 - project:
     name: autorelease-projects
     jobs:
+      - autorelease-branch-cut
       - 'autorelease-generate-release-notes-{stream}'
       - 'autorelease-release-{stream}':
           build-node: centos7-autorelease-4c-16g
+      - 'autorelease-update-submodules-{stream}'
       - 'autorelease-update-validate-jobs-{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}'
+      - neon:
           branch: 'master'
+          integration-test: neon
+          extra-mvn-opts: -P!karaf -Pignore-lispflowmapping-integrationtest -Dsft.heap.max=4g
+              -Dskip.karaf.featureTest=true
+      - fluorine:
+          branch: 'stable/fluorine'
+          integration-test: fluorine
+          extra-mvn-opts: -P!karaf -Pignore-lispflowmapping-integrationtest -Dsft.heap.max=4g
+              -Dskip.karaf.featureTest=true
+      - 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 -Pignore-lispflowmapping-integrationtest -Dsft.heap.max=4g
+              -Dskip.karaf.featureTest=true
 
     project: releng/autorelease
     project-name: autorelease
@@ -44,4 +41,11 @@
         **/target/failsafe-reports/failsafe-summary.xml
         **/hs_err_*.log
         **/target/feature/feature.xml
+    staging-profile-id: 425e43800fea70
     # TODO: **/*.hprof is too large, compress with xz first
+
+- project:
+    name: autorelease-view
+    views:
+      - project-view
+    project-name: autorelease