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 269cf528cf1c284c9dd295f5ecab8503182f44f4..6ba0a0b66d36501a5d2ef58e6942668541a0d447 100644 (file)
--- 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 d10f0a939667ce502dad3d6dfc4d80f95b1aea78..2731408fa9bb387f573768f267b92087a24d19b2 100644 (file)
--- 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}'