Remove parameter in autorelease build trigger

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

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 50a23191e5080fa7f000a29415e6238eb7447310..fe0efceb474d182af3e273e15ae9ca5746233db1 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -53,7 +53,7 @@
       - lf-infra-publish
 
 - job-template:
-    name: 'autorelease-release-{stream}'
+    name: 'autorelease-release-{stream}-{mvn-version}-{java-version}'
 
     ######################
     # Default parameters #
@@ -61,7 +61,9 @@
 
     build-node: '{build-node}'
     cron: 'H 0 * * *'
-    java-version: openjdk8
+    java-version: '{java-version}'
+    mvn-global-settings: global-settings
+    mvn-settings: autorelease-settings
     mvn-version: mvn35
     extra-mvn-opts: ''
 
@@ -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,11 +140,15 @@
       - 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
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - autorelease-distribute-taglist
       - distribute-build-url:
           path: 'integration/distribution/$KARAF_ARTIFACT/src/main/assembly'
@@ -155,21 +165,21 @@
               $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: '{mvn-version}'
-          settings: 'autorelease-settings'
-          global-settings: 'global-settings'
+          settings: '{mvn-settings}'
+          global-settings: '{mvn-global-settings}'
       - shell: |
           mkdir -p archives/
           cp *.log *.prop $_
@@ -178,12 +188,8 @@
       - opendaylight-infra-notify-status
       - trigger-parameterized-builds:
           - project: 'integration-distribution-test-{integration-test}'
-            condition: UNSTABLE_OR_BETTER
-            property-file: variables.jenkins-trigger
-            fail-on-missing: true
-          - project: 'integration-distribution-test-{integration-test}'
-            condition: FAILED
-            trigger-with-no-params: true
+            condition: STABLE
+            predefined-parameters: BUNDLE_URL=autorelease
           - project: 'packaging-build-rpm-{stream}'
             condition: UNSTABLE_OR_BETTER
             predefined-parameters: DOWNLOAD_URL=$BUNDLE_URL
@@ -347,6 +353,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}'
 
@@ -382,7 +401,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:
@@ -402,14 +421,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
 
@@ -446,8 +462,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'
@@ -484,11 +501,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 #
@@ -557,7 +577,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
@@ -566,12 +586,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
@@ -579,9 +599,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/