From: Luis Gomez <ecelgp@gmail.com>
Date: Wed, 29 Mar 2017 20:15:02 +0000 (-0700)
Subject: Distribution test optimization
X-Git-Tag: release/boron-sr3~7^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=releng%2Fbuilder.git;a=commitdiff_plain;h=2d2beba9204fa8f63239087d781aec22b6801112

Distribution test optimization

Autorelease will trigger distribution test for autorelease distro
if the build does not fail. In case of failure, it will trigger
distribution test on latest snapshot (no parameters).

Change-Id: I55212207819753e293c9d64892972b5e54970115
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
---

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 269cf528c..6ba0a0b66 100644
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -109,6 +109,8 @@
             condition: UNSTABLE_OR_BETTER
             property-file: variables.jenkins-trigger
             fail-on-missing: true
+          - project: 'integration-distribution-test-{integration-test}'
+            condition: FAILED
           - project: 'packaging-build-rpm-master'
             condition: UNSTABLE_OR_BETTER
             predefined-parameters: DOWNLOAD_URL=$BUNDLEURL
diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index d10f0a939..2731408fa 100644
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -20,7 +20,6 @@
           jre: 'openjdk8'
           csit-list: '{csit-list-carbon}'
           csit-weekly-list: '{csit-weekly-list-carbon}'
-          schedule: 'H H * * 0-4'
           schedule-weekly: 'H 12 * * 0'
 
       - boron:
@@ -29,7 +28,6 @@
           jre: 'openjdk8'
           csit-list: '{csit-list-boron}'
           csit-weekly-list: ''
-          schedule: 'H H * * 0-4'
           schedule-weekly: 'H 12 * * 0'
 
       - beryllium:
@@ -38,7 +36,6 @@
           jre: 'openjdk7'
           csit-list: '{csit-list-beryllium}'
           csit-weekly-list: ''
-          schedule: 'H H * * 6'
           schedule-weekly: 'H 12 * * 0'
 
     # tools system image
@@ -169,9 +166,6 @@
       - integration-jdk-version:
           jdkversion: '{jre}'
 
-    triggers:
-      - timed: '{schedule}'
-
     builders:
       - trigger-builds:
           - project: '{csit-list}'