X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-templates.yaml;h=a17507327ca66bbdbf6e62d83516bc031805bef8;hb=3556056329fc2644b807f336a896890a2d8e5d64;hp=8065f60e34ca995c5571e420aed41fa168c55f05;hpb=10833fd3e59e313340cd9f20f7876cc466bd13dc;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 8065f60e3..a17507327 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -2,12 +2,16 @@
 # Job templates in this file (please update with every new template):
 # FIXME: Update
 #
-# {project}-csit-verify-1node-{functionality}
 # {project}-csit-1node-{functionality}-{install}-{stream}
 # {project}-csit-1node-periodic-{functionality}-{install}-{stream}
-# {project}-csit-verify-3node-{functionality}
+# {project}-csit-3node-docker-{functionality}-{install}-{stream}
 # {project}-csit-3node-{functionality}-{install}-{stream}
 # {project}-csit-3node-periodic-{functionality}-{install}-{stream}
+# {project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}
+# {project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}
+# {project}-csit-verify-1node-{functionality}
+# {project}-csit-verify-3node-{functionality}
+# {project}-patch-test-{feature}-{stream}
 #
 # Parameters:
 # FIXME: Distinguish variables, macros and arguments, then update.
@@ -22,6 +26,7 @@
 # integration-stream-test-plan: stream specific robot test plan ($STREAMTESTPLAN)
 # integration-test-plan: fallback robot test plan ($TESTPLAN)
 # integration-patch-refspec: test branch ($PATCHREFSPEC)
+# integration-use-features-boot: bool to toggle use of featuresBoot ($USEFEATURESBOOT)
 
 
 # New templates
@@ -31,7 +36,7 @@
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -64,7 +69,8 @@
           jdkversion: '{verify-jdkversion}'
       - distribution-karaf-version:
           karaf-version: '{verify-karaf-version}'
-
+      - integration-use-features-boot:
+          use-features-boot: 'True'
     scm:
       - integration-gerrit-scm:
           basedir: 'test'
@@ -118,7 +124,7 @@
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -147,12 +153,16 @@
           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:
           jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
+      - integration-use-features-boot:
+          use-features-boot: 'True'
 
     scm:
       - integration-gerrit-scm:
@@ -233,7 +243,7 @@
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -262,12 +272,16 @@
           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:
           jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
+      - integration-use-features-boot:
+          use-features-boot: 'True'
 
     scm:
       - integration-gerrit-scm:
@@ -455,7 +469,7 @@
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -484,10 +498,14 @@
           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:
           karaf-version: '{verify-karaf-version}'
+      - integration-use-features-boot:
+          use-features-boot: 'True'
 
     scm:
       - integration-gerrit-scm:
@@ -542,7 +560,7 @@
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -571,12 +589,16 @@
           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:
           jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
+      - integration-use-features-boot:
+          use-features-boot: 'True'
 
     scm:
       - integration-gerrit-scm:
@@ -651,7 +673,7 @@
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -686,6 +708,8 @@
           jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
+      - integration-use-features-boot:
+          use-features-boot: 'True'
 
     scm:
       - integration-gerrit-scm:
@@ -762,7 +786,7 @@
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -791,12 +815,16 @@
           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:
           jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
+      - integration-use-features-boot:
+          use-features-boot: 'True'
 
     scm:
       - integration-gerrit-scm:
@@ -985,7 +1013,7 @@
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-8g
     concurrent: true
 
     properties:
@@ -1021,6 +1049,8 @@
           jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
+      - integration-use-features-boot:
+          use-features-boot: '{use-features-boot}'
       - string:
           name: OPENSTACK_BRANCH
           default: '{openstack-branch}'
@@ -1182,7 +1212,7 @@
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-8g
     concurrent: true
 
     properties:
@@ -1218,6 +1248,8 @@
           jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
+      - integration-use-features-boot:
+          use-features-boot: '{use-features-boot}'
       - string:
           name: OPENSTACK_BRANCH
           default: '{openstack-branch}'
@@ -1385,7 +1417,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}'