Merge "Distribution test optimization"

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index df4d646a7c4ab322246a278fc5b772d90f4c00e8..aa4ca9ce9bf9f6b1fc8a615d326757b5bb2191d0 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -112,6 +112,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 e7f3ab2a30c32058b49a24a05c9e18a88cd90aeb..9bd22af536e9295113b8bb7a09b529d934c39042 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
@@ -170,9 +167,6 @@
       - integration-jdk-version:
           jdkversion: '{jre}'
 
-    triggers:
-      - timed: '{schedule}'
-
     builders:
       - trigger-builds:
           - project: '{csit-list}'