From 18fa5eebf09dea54acab41851041d64ad1551127 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Thu, 3 Aug 2017 15:32:08 +0000 Subject: [PATCH] Revert "Add method to not trigger downstream ar-jobs" This reverts commit d69988e8377ff4c48aed40fce140005abe4fd709. Change-Id: Ie2f0a9e7e0247ba427fa8fd8f8bdd1213a921208 Signed-off-by: Thanh Ha --- jjb/autorelease/autorelease-templates.yaml | 62 +++++++++------------- 1 file changed, 25 insertions(+), 37 deletions(-) diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index 3176ae62e..42acb0f0d 100644 --- a/jjb/autorelease/autorelease-templates.yaml +++ b/jjb/autorelease/autorelease-templates.yaml @@ -41,9 +41,6 @@ -Dskip.karaf.featureTest=true # To disable karaf SingleFeatureTests --fail-never # NEVER fail the build, regardless of project result --fail-at-end # Only fail the build afterwards; allow all non-impacted builds to continue - - bool: - name: TRIGGER_DOWNSTREAM_JOBS - default: true scm: - git: @@ -121,40 +118,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: true - script-only-if-failed: true + - 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