Remove all references to -XX:MaxPermSize

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

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index f878828d03b7e6190b25c39a2a46fe8316cd6187..cb434a3b0760128cfafb9a0396a2995f271f6227 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -37,6 +37,7 @@
           branch: master
           refspec: 'refs/heads/master'
           jenkins-ssh-credential: opendaylight-jenkins-ssh
+          submodule-disable: false
           submodule-recursive: true
           submodule-timeout: 10
           choosing-strategy: default
@@ -63,10 +64,12 @@
     cron: 'H 0 * * *'
     java-version: '{java-version}'
     mvn-global-settings: global-settings
+    mvn-goals: clean deploy
+    mvn-opts: '-Xmx8g -Dmaven.compile.fork=true'
+    mvn-params: ''
     mvn-settings: autorelease-settings
     mvn-version: mvn35
-    extra-mvn-opts: ''
-    sign-artifacts: false
+    sign-artifacts: true
     disable-job: 'false'
 
     #####################
@@ -75,7 +78,6 @@
 
     project-type: freestyle
     node: '{build-node}'
-    jdk: '{java-version}'
     disabled: '{disable-job}'
 
     properties:
@@ -83,28 +85,19 @@
           build-days-to-keep: 30
 
     parameters:
-      - maven-exec:
-          maven-version: '{mvn-version}'
       - lf-infra-parameters:
           project: '{project}'
           stream: '{stream}'
           branch: '{branch}'
           lftools-version: '{lftools-version}'
+      - lf-infra-maven-parameters:
+          mvn-opts: '{mvn-opts}'
+          mvn-params: '{mvn-params}'
+          mvn-version: '{mvn-version}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
       - autorelease-release-tag:
           release-tag: '{stream}'
-      - string:
-          name: EXTRA_MVN_OPTS
-          default: '{extra-mvn-opts}'
-          description: |
-              Additional optional Maven Options to pass to the Maven Goals
-              parameter.
-
-              Examples:
-              -Dskip.karaf.featureTest=true  # To disable karaf SingleFeatureTests
-              --fail-never   # NEVER fail the build, regardless of project result
-              --fail-at-end  # Only fail the build afterwards; allow all non-impacted builds to continue
       - string:
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
@@ -146,8 +139,6 @@
       - lf-provide-maven-settings:
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
-      - lf-infra-create-netrc:
-          server-id: '{mvn-staging-id}'
       - autorelease-generate-release-patches
       - autorelease-generate-artifact-versions
       - lf-update-java-alternatives:
@@ -160,26 +151,16 @@
       # Keep the patches compatible with that ideal, but apply an edit
       # to enable building in a single maven reactor afterwards.
       - autorelease-fix-relative-paths
-      - maven-target:
-          maven-version: '{mvn-version}'
-          pom: 'pom.xml'
-          goals: |
-              clean deploy
-              $EXTRA_MVN_OPTS
-              -Pintegrationtests,repoBuild
-              -Dcheckstyle.skip=true
-              -DaltDeploymentRepository=staging::default::file:"$WORKSPACE"/m2repo
-              {opendaylight-infra-mvn-opts}
-          java-opts:
-            - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: '{mvn-global-settings}'
-          global-settings-type: cfp
+      - lf-maven-build:
+          mvn-goals: '{mvn-goals}'
       - lf-sigul-sign-dir:
           sign-artifacts: '{sign-artifacts}'
           sign-dir: '$WORKSPACE/m2repo'
-      - lf-maven-stage
+          sign-mode: serial
+      - lf-maven-stage:
+          mvn-global-settings: '{mvn-global-settings}'
+          mvn-settings: '{mvn-settings}'
+          mvn-staging-id: '{mvn-staging-id}'
       - autorelease-get-integration-test-variables
       - autorelease-maven-sources:
           opendaylight-infra-mvn-opts: '{opendaylight-infra-mvn-opts}'
@@ -257,6 +238,7 @@
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           jenkins-ssh-credential: opendaylight-jenkins-ssh
+          submodule-disable: false
           submodule-recursive: true
           submodule-timeout: 10
           choosing-strategy: default
@@ -322,6 +304,7 @@
           branch: master
           refspec: 'refs/heads/master'
           jenkins-ssh-credential: opendaylight-jenkins-ssh
+          submodule-disable: false
           submodule-recursive: true
           submodule-timeout: 10
           choosing-strategy: default
@@ -425,6 +408,7 @@
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           jenkins-ssh-credential: opendaylight-jenkins-ssh
+          submodule-disable: false
           submodule-recursive: true
           submodule-timeout: 10
           choosing-strategy: default
@@ -482,13 +466,14 @@
           name: RELEASE
           description: |
               Release to generate release notes for.
-              Eg. Oxygen-SR1, Fluorine-SR2...
+              Eg. Neon-SR1, Fluorine-SR2...
     scm:
       - lf-infra-gerrit-scm:
           git-url: '$GIT_URL/$GERRIT_PROJECT'
           branch: '$GERRIT_BRANCH'
           refspec: '$GERRIT_REFSPEC'
           jenkins-ssh-credential: opendaylight-jenkins-ssh
+          submodule-disable: false
           submodule-recursive: true
           submodule-timeout: 10
           choosing-strategy: default
@@ -617,7 +602,7 @@
               -Pq
               {opendaylight-infra-mvn-opts}
           java-opts:
-            - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+            - '-Xmx8g -Dmaven.compile.fork=true'
           settings: '{mvn-settings}'
           settings-type: cfp
           global-settings: '{mvn-global-settings}'