Merge "Update requirements to JJB 1.6.2"

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 465418ed6a697476be54fff3e86fd3b079ff90e8..8fc01a7629112721b7ae843d85eadef3bf712f9b 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -122,8 +122,6 @@
       - opendaylight-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
 
-    testplan: '{project}-{functionality}.txt'
-
     parameters:
       - opendaylight-infra-parameters:
           project: 'integration/test'
@@ -145,7 +143,7 @@
       - integration-stream-test-plan:
           stream-test-plan: '{project}-{functionality}-{stream}.txt'
       - integration-test-plan:
-          test-plan: '{testplan}'
+          test-plan: '{project}-{functionality}.txt'
       - integration-patch-refspec:
           branch: 'master'
       - integration-jdk-version:
@@ -540,8 +538,6 @@
       - opendaylight-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
 
-    testplan: '{project}-{functionality}.txt'
-
     parameters:
       - opendaylight-infra-parameters:
           project: 'integration/test'
@@ -563,7 +559,7 @@
       - integration-stream-test-plan:
           stream-test-plan: '{project}-{functionality}-{stream}.txt'
       - integration-test-plan:
-          test-plan: '{testplan}'
+          test-plan: '{project}-{functionality}.txt'
       - integration-patch-refspec:
           branch: 'master'
       - integration-jdk-version:

diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml
index c0b29826fc8cc31fb2b677e98d6323fa98f2e8c3..1608c00b6cf7076ad561cb852e9fc0a9da4c4d6d 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-clustering.yaml
+++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml
@@ -7,8 +7,6 @@
     # The project name
     project: 'ovsdb'
 
-    testplan: 'ovsdb-clustering.txt'
-
     # The functionality under test
     functionality:
       - 'upstream-clustering'

diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml
index 4ae58f9ca746a3f7eb56d08542bafb6067cd5c3c..142e5e28d92cae773d3f22d8ae13fe7bd0c4da0b 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-southbound.yaml
+++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml
@@ -7,14 +7,11 @@
     # The project name
     project: 'ovsdb'
 
-    testplan: 'ovsdb-southbound.txt'
-
     # The functionality under test
     functionality:
       - 'upstream-southbound'
       - 'gate-southbound'
 
-
     # Project branches
     stream:
       - carbon: