X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Fautorelease-templates.yaml;h=cb434a3b0760128cfafb9a0396a2995f271f6227;hb=fbb6852790ef13e01d614200cf9c9ac821105ef5;hp=b00cc101ed8ad944a06f01e19a033174fac3883d;hpb=8a8d6df81404e91205367160ae90f80b9d5ee409;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index b00cc101e..cb434a3b0 100644
--- 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
@@ -64,13 +65,11 @@
     java-version: '{java-version}'
     mvn-global-settings: global-settings
     mvn-goals: clean deploy
-    mvn-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-    mvn-params: '-Pintegrationtests,repoBuild -Dcheckstyle.skip=true'
+    mvn-opts: '-Xmx8g -Dmaven.compile.fork=true'
+    mvn-params: ''
     mvn-settings: autorelease-settings
     mvn-version: mvn35
-    sign-artifacts: false
-    mvn-central: false
-    ossrh-profile-id: 6386ebbbf3a563
+    sign-artifacts: true
     disable-job: 'false'
 
     #####################
@@ -140,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:
@@ -159,10 +156,11 @@
       - lf-sigul-sign-dir:
           sign-artifacts: '{sign-artifacts}'
           sign-dir: '$WORKSPACE/m2repo'
-      - lf-maven-stage
-      - lf-maven-central:
-          mvn-central: '{mvn-central}'
-          ossrh-profile-id: '{ossrh-profile-id}'
+          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}'
@@ -240,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
@@ -305,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
@@ -408,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
@@ -465,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
@@ -600,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}'