Merge "Make the os services easier to follow"

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

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index d1e3ec70601c75bfb0e6ddfe46fa82e2dc78198c..766d13fa1860b03fa68a3387c75251457b6f4050 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -23,6 +23,7 @@
           project: '{project}'
           stream: '{stream}'
           branch: '{branch}'
+          lftools-version: '{lftools-version}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
       - autorelease-release-tag:
@@ -42,12 +43,6 @@
           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:
@@ -81,6 +76,7 @@
           autorelease-settings: 'autorelease-settings'
           global-settings: 'odl-global-settings'
       - autorelease-generate-release-patches
+      - autorelease-generate-artifact-versions
       - autorelease-distribute-taglist
       - distribute-build-url:
           path: 'integration/distribution/$KARAF_ARTIFACT/src/main/assembly'
@@ -119,39 +115,31 @@
 
     publishers:
       - opendaylight-infra-notify-status
-      - 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
+      - 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
       - lf-infra-publish
 
 - job-template:
@@ -168,6 +156,7 @@
           project: releng/builder
           branch: '{branch}'
           stream: '{stream}'
+          lftools-version: '{lftools-version}'
 
     scm:
       - lf-infra-gerrit-scm:
@@ -227,6 +216,7 @@
           branch: '{branch}'
           stream: '{stream}'
           refspec: 'refs/heads/{branch}'
+          lftools-version: '{lftools-version}'
       - string:
           name: RELEASE_TAG
           default: '{next-release-tag}'
@@ -291,6 +281,7 @@
           project: '{project}'
           branch: '{branch}'
           stream: '{stream}'
+          lftools-version: '{lftools-version}'
 
     scm:
       - lf-infra-gerrit-scm:
@@ -345,6 +336,7 @@
           project: '{project}'
           stream: '{stream}'
           branch: '{branch}'
+          lftools-version: '{lftools-version}'
       - autorelease-release-tag:
           release-tag: validate
       - string: