Merge "Fix genius CSIT jobs"

[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 b4afb7963101f5fc6844734940526e104a9ae7fd..b5c23f5aed742c8221622a691fe85a4d28a76cbc 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -29,7 +29,7 @@
 
       - nitrogen:
           branch: 'stable/nitrogen'
-          csit-blacklist: longevity gate sanity capwap centinel coe didm iotdm jsonrpc lacp netide tsdr
+          csit-blacklist: longevity gate sanity capwap centinel coe didm iotdm jsonrpc lacp netide tsdr tdd wip
           csit-list: !include: csit-jobs-nitrogen.lst
           csit-sanity-list: '{csit-sanity-list-nitrogen}'
           csit-weekly-list: '{csit-weekly-list-nitrogen}'
@@ -39,7 +39,7 @@
       - carbon:
           branch: 'stable/carbon'
           karaf-version: karaf3
-          csit-blacklist: longevity gate sanity capwap centinel coe jsonrpc
+          csit-blacklist: longevity gate sanity capwap centinel coe jsonrpc tdd wip
           csit-list: !include: csit-jobs-carbon.lst
           csit-sanity-list: '{csit-sanity-list-carbon}'
           csit-weekly-list: '{csit-weekly-list-carbon}'
@@ -237,7 +237,7 @@
 
     project-type: freestyle
     node: centos7-builder-4c-4g
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties: