Merge "Update Ubuntu 14.04 gbp images"

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

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index b49de338d8c0f646c2da3b2ec3b7fe1a56918db2..d1e3ec70601c75bfb0e6ddfe46fa82e2dc78198c 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -42,6 +42,12 @@
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
           description: Artifacts to archive to the logs server.
+      - bool:
+          name: TRIGGER_DOWNSTREAM_JOBS
+          default: true
+          description: |
+              Used by the post-build-script step to determine if downstream
+              jobs should be triggered for this run or not.
 
     scm:
       - git:
@@ -50,7 +56,7 @@
           refspec: '$GERRIT_REFSPEC'
           branches:
             - '$GERRIT_BRANCH'
-          choosing-strategy: 'gerrit'
+          choosing-strategy: default
           skip-tag: true
           submodule:
             recursive: true
@@ -113,31 +119,39 @@
 
     publishers:
       - 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
-          - project: 'integration-sanity-test-{integration-test}'
-            condition: UNSTABLE_OR_BETTER
-            property-file: variables.jenkins-trigger
-            fail-on-missing: true
-          - project: 'integration-sanity-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
-            property-file: variables.jenkins-trigger
-            fail-on-missing: true
-          - project: 'packaging-build-deb-{stream}'
-            condition: UNSTABLE_OR_BETTER
-            predefined-parameters: DOWNLOAD_URL=$BUNDLE_URL
-            property-file: variables.jenkins-trigger
-            fail-on-missing: true
+      - postbuildscript:
+          builders:
+            - conditional-step:
+                condition-kind: boolean-expression
+                condition-expression: $TRIGGER_DOWNSTREAM_JOBS
+                steps:
+                  - trigger-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
+                      - project: 'integration-sanity-test-{integration-test}'
+                        condition: UNSTABLE_OR_BETTER
+                        property-file: variables.jenkins-trigger
+                        fail-on-missing: true
+                      - project: 'integration-sanity-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
+                        property-file: variables.jenkins-trigger
+                        fail-on-missing: true
+                      - project: 'packaging-build-deb-{stream}'
+                        condition: UNSTABLE_OR_BETTER
+                        predefined-parameters: DOWNLOAD_URL=$BUNDLE_URL
+                        property-file: variables.jenkins-trigger
+                        fail-on-missing: true
+          script-only-if-succeeded: false
+          script-only-if-failed: false
       - lf-infra-publish
 
 - job-template:
@@ -320,7 +334,7 @@
     project-type: freestyle
     node: '{build-node}'
     concurrent: true
-    jdk: '{jdk}'
+    jdk: openjdk8
 
     properties:
       - lf-infra-properties: