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 151e3a3c71701abbf86f7d6639b685760c1964b5..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,7 @@
 
     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
@@ -147,6 +147,8 @@
           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'
@@ -186,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
@@ -464,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'