Distribution test optimization

[releng/builder.git] / jjb / integration / integration-test-jobs.yaml

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 05475de15590e55fa0134de96cc2363ff886f520..2731408fa9bb387f573768f267b92087a24d19b2 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -3,12 +3,14 @@
     name: integration-test
     project: integration/test
     project-name: integration-test
+    test-branch: master
     jobs:
-      - '{project-name}-verify-tox-{stream}'
+      - '{project-name}-verify-tox-master'
       - 'integration-csit-verify-1node-library'
       - 'integration-distribution-test-{stream}'
       - 'integration-patch-test-{stream}'
       - 'integration-multipatch-test-{stream}'
+      - 'integration-distribution-weekly-test-trigger-{stream}'
 
     # CSIT Lists in releng-defaults.yaml
     stream:
@@ -17,21 +19,24 @@
           jdk: 'openjdk8'
           jre: 'openjdk8'
           csit-list: '{csit-list-carbon}'
-          schedule: 'H H * * 0-4'
+          csit-weekly-list: '{csit-weekly-list-carbon}'
+          schedule-weekly: 'H 12 * * 0'
 
       - boron:
           branch: 'stable/boron'
           jdk: 'openjdk8'
           jre: 'openjdk8'
           csit-list: '{csit-list-boron}'
-          schedule: 'H H * * 0-4'
+          csit-weekly-list: ''
+          schedule-weekly: 'H 12 * * 0'
 
       - beryllium:
           branch: 'stable/beryllium'
           jdk: 'openjdk7'
           jre: 'openjdk7'
           csit-list: '{csit-list-beryllium}'
-          schedule: 'H H * * 6'
+          csit-weekly-list: ''
+          schedule-weekly: 'H 12 * * 0'
 
     # tools system image
     tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
@@ -52,8 +57,6 @@
     branch: stable/boron
     scope: only
     jre: openjdk8
-    # Integration/Test branch remains hardcoded to 'master' as int/test does not have any other branch.
-    test-branch: master
 
     properties:
       - opendaylight-infra-properties:
@@ -163,9 +166,6 @@
       - integration-jdk-version:
           jdkversion: '{jre}'
 
-    triggers:
-      - timed: '{schedule}'
-
     builders:
       - trigger-builds:
           - project: '{csit-list}'
@@ -358,3 +358,34 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[int/dist]'
+
+- job-template:
+    name: 'integration-distribution-weekly-test-trigger-{stream}'
+
+    project-type: freestyle
+    node: centos7-robot-2c-2g
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - integration-bundleurl:
+          bundleurl: '{bundleurl}'
+      - integration-jdk-version:
+          jdkversion: '{jre}'
+
+    triggers:
+      - timed: '{schedule-weekly}'
+
+    builders:
+      - trigger-builds:
+          - project: '{csit-weekly-list}'
+            block: true
+            predefined-parameters:
+              BUNDLEURL=$BUNDLEURL
+
+    publishers:
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[integration]'