Merge "Update cloud image list docs"

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

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 559de85f74c0dcb09298a441e9b0c13a0ae0f73c..d185ee818e2daeaa984ac65aafd067fda3ff3e6d 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,11 +61,12 @@
 
     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: ''
+    disable-job: 'false'
 
     #####################
     # Job Configuration #
@@ -74,6 +75,7 @@
     project-type: freestyle
     node: '{build-node}'
     jdk: '{java-version}'
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -147,6 +149,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,11 +190,12 @@
       - opendaylight-infra-notify-status
       - trigger-parameterized-builds:
           - project: 'integration-distribution-test-{integration-test}'
-            condition: STABLE
-            predefined-parameters: |
-              BUNDLE_URL=autorelease
-              KARAF_VERSION=$KARAF_VERSION
+            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
           - project: 'packaging-build-rpm-{stream}'
             condition: UNSTABLE_OR_BETTER
             predefined-parameters: DOWNLOAD_URL=$BUNDLE_URL
@@ -220,6 +225,7 @@
     ######################
 
     cron: 'H 0 * * *'
+    disable-job: 'false'
 
     #####################
     # Job configuration #
@@ -227,6 +233,7 @@
 
     project-type: freestyle
     node: centos7-builder-2c-2g
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -284,6 +291,7 @@
     ######################
 
     cron: '@weekly'
+    disable-job: 'false'
 
     #####################
     # Job configuration #
@@ -291,6 +299,7 @@
 
     project-type: freestyle
     node: centos7-builder-2c-1g
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -362,6 +371,7 @@
     mvn-global-settings: global-settings
     mvn-settings: autorelease-settings
     mvn-version: mvn35
+    disable-job: 'false'
 
     #####################
     # Job configuration #
@@ -369,6 +379,7 @@
 
     project-type: freestyle
     node: '{build-node}'
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
@@ -439,6 +450,7 @@
     ######################
     # Default parameters #
     ######################
+    disable-job: 'false'
 
     gerrit_merge_triggers:
       - comment-added-contains-event:
@@ -450,6 +462,7 @@
 
     project-type: freestyle
     node: centos7-builder-2c-8g
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -510,18 +523,19 @@
     mvn-global-settings: global-settings
     mvn-settings: autorelease-settings
     mvn-version: mvn35
+    disable-job: 'false'
 
     #####################
     # Job Configuration #
     #####################
 
-    disabled: false
     project-type: freestyle
     # Note: This NEEDS to be hardcoded as projects should NOT be allowed to
     #       override the build node.
     node: centos7-builder-2c-8g
     concurrent: true
     jdk: '{java-version}'
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties: