X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Fautorelease-templates.yaml;h=c28d4f55f28b8f5c0d354dbe9eaddee17b267eb5;hb=02f1186009927502f66759a97a419faa86ccbe11;hp=23453c27c718ca34979efbe3a8d0847f59252f26;hpb=7596af123f93f72e7cfc7145a2f19ef6fc122a31;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 23453c27c..c28d4f55f 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-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
@@ -341,15 +341,14 @@
           gerrit-user: 'jenkins-$SILO'
           gerrit-host: 'git.opendaylight.org'
           gerrit-topic: 'autorelease-update-validate-jobs-{stream}'
-          gerrit-commit-message: |
-              'Update validate autorelease projects for {stream}'
+          gerrit-commit-message: 'Update validate-ar jobs for {stream}'
           reviewers-email: 'jenkins-releng@opendaylight.org'
 
     publishers:
       - lf-infra-publish
 
 - job-template:
-    name: autorelease-version-bump-{stream}
+    name: autorelease-version-bump-{stream}-{mvn-version}-{java-version}
 
     #####################
     # Default variables #
@@ -408,6 +407,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
@@ -420,6 +420,8 @@
     builders:
       - lf-infra-pre-build
       # force jenkins install of maven version before any shell scripts use it
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
       - lf-maven-install:
           mvn-version: '{mvn-version}'
       - lf-provide-maven-settings:
@@ -465,13 +467,14 @@
           name: RELEASE
           description: |
               Release to generate release notes for.
-              Eg. Oxygen-SR1, Fluorine-SR2...
+              Eg. Sodium-SR1, Magnesium-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
@@ -567,6 +570,8 @@
 
     builders:
       - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
       - autorelease-checkout-gerrit-patch
       - autorelease-compare-projects
       - lf-jacoco-nojava-workaround
@@ -600,7 +605,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}'