Switch the csit-hwvtep-openstack to use job prefix

[releng/builder.git] / jjb / integration / integration-templates.yaml

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 0dfaffd57c393e1058a7a01bb4c0af52c3d19e14..3f7ae25adabda9dd8a2667955e9dbe6aedb08b6c 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -32,11 +32,12 @@
 # New templates
 
 - job-template:
-    name: '{project}-csit-verify-1node-{functionality}'
+    name: '{prefix}{project}-csit-verify-1node-{functionality}'
+    id: inttest-csit-verify-1node
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-1c-4g
+    node: centos7-robot-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -124,7 +125,7 @@
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-1c-4g
+    node: centos7-robot-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -153,6 +154,8 @@
           stream-test-plan: '{project}-{functionality}-{stream}.txt'
       - integration-test-plan:
           test-plan: '{project}-{functionality}.txt'
+      - integration-test-suites:
+          test-suites: '{test-suites}'
       - integration-patch-refspec:
           branch: 'master'
       - integration-jdk-version:
@@ -241,7 +244,7 @@
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-1c-4g
+    node: centos7-robot-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -270,6 +273,8 @@
           stream-test-plan: '{project}-{functionality}-{stream}.txt'
       - integration-test-plan:
           test-plan: '{project}-{functionality}.txt'
+      - integration-test-suites:
+          test-suites: '{test-suites}'
       - integration-patch-refspec:
           branch: 'master'
       - integration-jdk-version:
@@ -465,7 +470,7 @@
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-1c-4g
+    node: centos7-robot-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -494,6 +499,8 @@
           stream-test-plan: '{project}-{functionality}-{verify-stream}.txt'
       - integration-test-plan:
           test-plan: '{project}-{functionality}.txt'
+      - integration-test-suites:
+          test-suites: '{test-suites}'
       - integration-jdk-version:
           jdkversion: '{verify-jdkversion}'
       - distribution-karaf-version:
@@ -554,7 +561,7 @@
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-1c-4g
+    node: centos7-robot-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -583,6 +590,8 @@
           stream-test-plan: '{project}-{functionality}-{stream}.txt'
       - integration-test-plan:
           test-plan: '{project}-{functionality}.txt'
+      - integration-test-suites:
+          test-suites: '{test-suites}'
       - integration-patch-refspec:
           branch: 'master'
       - integration-jdk-version:
@@ -665,7 +674,7 @@
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-1c-4g
+    node: centos7-robot-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -778,7 +787,7 @@
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-1c-4g
+    node: centos7-robot-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -807,6 +816,8 @@
           stream-test-plan: '{project}-{functionality}-{stream}.txt'
       - integration-test-plan:
           test-plan: '{project}-{functionality}.txt'
+      - integration-test-suites:
+          test-suites: '{test-suites}'
       - integration-patch-refspec:
           branch: 'master'
       - integration-jdk-version:
@@ -999,7 +1010,8 @@
       - lf-infra-publish
 
 - job-template:
-    name: '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
+    name: '{prefix}{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
+    id: inttest-csit-hwvtep-openstack
     disabled: false
 
     project-type: freestyle
@@ -1407,7 +1419,7 @@
     name: '{project}-patch-test-{feature}-{stream}'
 
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
     concurrent: true
     jdk: '{jdk}'