Merge "Add boolean parameter to run test after build"

[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 9bd22af536e9295113b8bb7a09b529d934c39042..ebdc8e320a4bc8744211d755ba9fe3bdf73a8def 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -8,17 +8,26 @@
       - '{project-name}-verify-tox-master'
       - 'integration-csit-verify-1node-library'
       - 'integration-distribution-test-{stream}'
+      - 'integration-sanity-test-{stream}'
       - 'integration-patch-test-{stream}'
       - 'integration-multipatch-test-{stream}'
       - 'integration-distribution-weekly-test-trigger-{stream}'
 
     # CSIT Lists in releng-defaults.yaml
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
+          jre: 'openjdk8'
+          csit-list: '{csit-list-nitrogen}'
+          csit-sanity-list: '{csit-sanity-list-nitrogen}'
+          csit-weekly-list: '{csit-weekly-list-nitrogen}'
+          schedule-weekly: 'H 12 * * 0'
+      - carbon:
+          branch: 'stable/carbon'
           jdk: 'openjdk8'
           jre: 'openjdk8'
           csit-list: '{csit-list-carbon}'
+          csit-sanity-list: '{csit-sanity-list-carbon}'
           csit-weekly-list: '{csit-weekly-list-carbon}'
           schedule-weekly: 'H 12 * * 0'
 
@@ -27,7 +36,8 @@
           jdk: 'openjdk8'
           jre: 'openjdk8'
           csit-list: '{csit-list-boron}'
-          csit-weekly-list: ''
+          csit-sanity-list: '{csit-sanity-list-boron}'
+          csit-weekly-list: '{csit-weekly-list-boron}'
           schedule-weekly: 'H 12 * * 0'
 
       - beryllium:
@@ -35,6 +45,7 @@
           jdk: 'openjdk7'
           jre: 'openjdk7'
           csit-list: '{csit-list-beryllium}'
+          csit-sanity-list: ''
           csit-weekly-list: ''
           schedule-weekly: 'H 12 * * 0'
 
@@ -149,7 +160,7 @@
 
 # Template: integration-distribution-test-{stream}
 # Goal: Verify a distribution through all system test available
-# Operation: This daily job template takes a distribution and passes all available system test
+# Operation: This template takes a distribution and passes all available system test
 
 - job-template:
     name: 'integration-distribution-test-{stream}'
@@ -179,6 +190,38 @@
           email-recipients: '{email-recipients}'
           email-prefix: '[integration]'
 
+# Template: integration-sanity-test-{stream}
+# Goal: Verify a distribution through sanity test
+# Operation: This template takes a distribution and passes sanity test
+
+- job-template:
+    name: 'integration-sanity-test-{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}'
+
+    builders:
+      - trigger-builds:
+          - project: '{csit-sanity-list}'
+            block: true
+            predefined-parameters:
+              BUNDLEURL=$BUNDLEURL
+
+    publishers:
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[integration]'
+
 # Template: integration-patch-test-{stream}
 # Goal: Build a patch and run all available system test on a distribution containing the change
 # Operation: This job template builds a patch, creates a distribution containing the patch, and
@@ -310,6 +353,8 @@
     parameters:
       - patches-to-build-parameter:
           patches_to_build: '$PATCHES_TO_BUILD'
+      - run-test-parameter:
+          run-test: 'false'
       - integration-distribution-branch:
           branch: '{branch}'
       - opendaylight-infra-parameters:
@@ -349,11 +394,15 @@
       post-step-run-condition: 'SUCCESS'
 
     postbuilders:
-      - trigger-builds:
-          - project: '{csit-list}'
-            block: true
-            predefined-parameters:
-              BUNDLEURL=$BUNDLEURL
+      - conditional-step:
+          condition-kind: boolean-expression
+          condition-expression: $RUNTEST
+          steps:
+            - trigger-builds:
+                - project: '{csit-list}'
+                  block: true
+                  predefined-parameters:
+                    BUNDLEURL=$BUNDLEURL
 
     publishers:
       - opendaylight-infra-shiplogs: