X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fautorelease%2Fautorelease-templates.yaml;h=a17b29adc5cb40ab436b00d27218239081d53ae9;hb=fb8aea9c9c29651f761019b325dee04957b3d293;hp=4a320b8ca5b5c70a1c505014ef563624eaea2514;hpb=68a22512dee8604a172f19e6e75ed5dcf4faba29;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 4a320b8ca..a17b29adc 100644
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -62,6 +62,8 @@
     build-node: '{build-node}'
     cron: 'H 0 * * *'
     java-version: openjdk8
+    mvn-global-settings: global-settings
+    mvn-settings: autorelease-settings
     mvn-version: mvn35
     extra-mvn-opts: ''
 
@@ -79,7 +81,7 @@
 
     parameters:
       - maven-exec:
-          maven-version: 'mvn35'
+          maven-version: '{mvn-version}'
       - lf-infra-parameters:
           project: '{project}'
           stream: '{stream}'
@@ -104,6 +106,10 @@
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
           description: Artifacts to archive to the logs server.
+      - string:
+          name: STAGING_PROFILE_ID
+          default: '{staging-profile-id}'
+          description: Nexus staging profile ID.
 
     scm:
       - git:
@@ -134,9 +140,11 @@
       - lf-jacoco-nojava-workaround
       - shell: "./scripts/list-project-dependencies.sh"
       - autorelease-determine-merge-order
-      - autorelease-cfp:
-          autorelease-settings: 'autorelease-settings'
-          global-settings: 'odl-global-settings'
+      - 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
       - autorelease-distribute-taglist
@@ -148,29 +156,28 @@
       # to enable building in a single maven reactor afterwards.
       - autorelease-fix-relative-paths
       - maven-target:
-          maven-version: 'mvn35'
+          maven-version: '{mvn-version}'
           pom: 'pom.xml'
           goals: |
               clean deploy
               $EXTRA_MVN_OPTS
               -Pintegrationtests,repoBuild
               -Dcheckstyle.skip=true
-              -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage
+              -DaltDeploymentRepository=staging::default::file:"$WORKSPACE"/m2repo
               {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-          settings: 'autorelease-settings'
+          settings: '{mvn-settings}'
           settings-type: cfp
-          global-settings: 'global-settings'
+          global-settings: '{mvn-global-settings}'
           global-settings-type: cfp
-      - autorelease-maven-deploy
+      - lf-maven-stage
       - autorelease-get-integration-test-variables
       - autorelease-maven-sources:
           opendaylight-infra-mvn-opts: '{opendaylight-infra-mvn-opts}'
-          maven-version: 'mvn35'
-          settings: 'autorelease-settings'
-          global-settings: 'global-settings'
-      - autorelease-maven-sources-post-process
+          maven-version: '{mvn-version}'
+          settings: '{mvn-settings}'
+          global-settings: '{mvn-global-settings}'
       - shell: |
           mkdir -p archives/
           cp *.log *.prop $_
@@ -348,6 +355,19 @@
 
 - job-template:
     name: autorelease-version-bump-{stream}
+
+    #####################
+    # Default variables #
+    #####################
+
+    mvn-global-settings: global-settings
+    mvn-settings: autorelease-settings
+    mvn-version: mvn35
+
+    #####################
+    # Job configuration #
+    #####################
+
     project-type: freestyle
     node: '{build-node}'
 
@@ -383,7 +403,7 @@
               and artifacts are not pushed to Nexus. Instead the build will be
               performed using the goals "clean install".
       - maven-exec:
-          maven-version: mvn35
+          maven-version: '{mvn-version}'
 
     scm:
       - lf-infra-gerrit-scm:
@@ -403,14 +423,11 @@
     builders:
       - lf-infra-pre-build
       # force jenkins install of maven version before any shell scripts use it
-      - maven-target:
-          maven-version: mvn35
-          goals: '-version'
-          settings: autorelease-settings
-          settings-type: cfp
-          global-settings: global-settings
-          global-settings-type: cfp
-      - autorelease-cfp
+      - lf-maven-install:
+          mvn-version: '{mvn-version}'
+      - lf-provide-maven-settings:
+          global-settings-file: '{mvn-global-settings}'
+          settings-file: '{mvn-settings}'
       - shell: !include-raw-escape:
           - version-bump.sh
 
@@ -447,8 +464,9 @@
           lftools-version: '{lftools-version}'
       - string:
           name: RELEASE
-          description: Release to generate release notes for.
-
+          description: |
+              Release to generate release notes for.
+              Eg. Oxygen-SR1, Fluorine-SR2...
     scm:
       - lf-infra-gerrit-scm:
           git-url: '$GIT_URL/$GERRIT_PROJECT'
@@ -485,11 +503,14 @@
 - job-template:
     name: '{project-name}-validate-autorelease-{stream}'
 
-    ############
-    # Defaults #
-    ############
+    #####################
+    # Default variables #
+    #####################
 
     java-version: openjdk8
+    mvn-global-settings: global-settings
+    mvn-settings: autorelease-settings
+    mvn-version: mvn35
 
     #####################
     # Job Configuration #
@@ -558,7 +579,7 @@
       # to enable building in a single maven reactor afterwards.
       - autorelease-fix-relative-paths
       - maven-target:
-          maven-version: mvn35
+          maven-version: '{mvn-version}'
           pom: validate-pom.xml
           goals: |
               clean install dependency:tree
@@ -567,12 +588,12 @@
               {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx8g'
-          settings: autorelease-settings
+          settings: '{mvn-settings}'
           settings-type: cfp
-          global-settings: global-settings
+          global-settings: '{mvn-global-settings}'
           global-settings-type: cfp
       - maven-target:
-          maven-version: mvn35
+          maven-version: '{mvn-version}'
           pom: pom.xml
           goals: |
               clean validate
@@ -580,9 +601,9 @@
               {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-          settings: autorelease-settings
+          settings: '{mvn-settings}'
           settings-type: cfp
-          global-settings: global-settings
+          global-settings: '{mvn-global-settings}'
           global-settings-type: cfp
       - shell: |
           mkdir -p archives/