From b17a837983985180d075a27f47776f1ef97722d4 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Mon, 14 Aug 2017 10:22:51 -0400 Subject: [PATCH] Revert "Add method to not trigger downstream ar" This reverts commit 32b1f54a6145cbe9558d4c8810bd584197c68458. The "builder" type for triggering downstream jobs do not support checking if the job is unstable or failed so causes 2 copies of every job to trigger. Looks like we need to find another way to handle this :( Change-Id: Ic2f725ac9f9753c6d59624f99b1d635e84f72015 Signed-off-by: Thanh Ha --- jjb/autorelease/autorelease-templates.yaml | 64 +++++++++------------- 1 file changed, 25 insertions(+), 39 deletions(-) diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index d1e3ec706..ee3bb89c2 100644 --- a/jjb/autorelease/autorelease-templates.yaml +++ b/jjb/autorelease/autorelease-templates.yaml @@ -42,12 +42,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: @@ -119,39 +113,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: -- 2.36.6