Merge "Add a swap file to build machines"

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

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 9cc0465169b436078409a9bb424213d71402375a..877dc08d18a0ec59f47f0bdc88dbd6e42aa51755 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -12,32 +12,15 @@
       - '{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:
       - fluorine:
-          next-release-tag: '{stream}'
           branch: 'master'
           integration-test: fluorine
-          extra-mvn-opts: -Dsft.heap.max=4g
+          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
-      - 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