Merge "Resouce optimize packer verify job to single instance"

[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 0c385654b14018bc129f5292dde4d4388fe9cfac..4d74f0cc94b626e4f05f5870f455286b9e87d781 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -28,11 +28,12 @@
                 lispflowmapping-csit-1node-msmr-all-{stream},
                 nemo-csit-1node-engine-all-{stream},
                 nemo-csit-1node-engine-only-{stream},
-                netvirt-csit-1node-openstack-basic-only-{stream},
-                netvirt-csit-1node-openstack-basic-all-{stream},
-                netvirt-csit-1node-openstack-mitaka-openstack-{stream},
-                netvirt-vpnservice-csit-1node-openstack-mitaka-openstack-{stream},
-                netvirt-csit-3node-clustering-only-{stream},
+                netvirt-csit-1node-openstack-mitaka-upstream-learn-{stream},
+                netvirt-csit-1node-openstack-mitaka-upstream-transparent-{stream},
+                netvirt-legacy-csit-1node-openstack-basic-all-{stream},
+                netvirt-legacy-csit-1node-openstack-basic-only-{stream},
+                netvirt-legacy-csit-1node-openstack-mitaka-upstream-{stream},
+                netvirt-legacy-csit-3node-clustering-only-{stream},
                 ocpplugin-csit-1node-get-only-{stream},
                 ocpplugin-csit-1node-get-all-{stream},
                 ocpplugin-csit-1node-scalability-only-{stream},
@@ -84,11 +85,12 @@
                 lispflowmapping-csit-1node-msmr-all-{stream},
                 nemo-csit-1node-engine-all-{stream},
                 nemo-csit-1node-engine-only-{stream},
-                netvirt-csit-1node-openstack-basic-only-{stream},
-                netvirt-csit-1node-openstack-basic-all-{stream},
-                netvirt-csit-1node-openstack-mitaka-openstack-{stream},
-                netvirt-vpnservice-csit-1node-openstack-mitaka-openstack-{stream},
-                netvirt-csit-3node-clustering-only-{stream},
+                netvirt-csit-1node-openstack-mitaka-upstream-learn-{stream},
+                netvirt-csit-1node-openstack-mitaka-upstream-transparent-{stream},
+                netvirt-legacy-csit-1node-openstack-basic-all-{stream},
+                netvirt-legacy-csit-1node-openstack-basic-only-{stream},
+                netvirt-legacy-csit-1node-openstack-mitaka-upstream-{stream},
+                netvirt-legacy-csit-3node-clustering-only-{stream},
                 ocpplugin-csit-1node-get-only-{stream},
                 ocpplugin-csit-1node-get-all-{stream},
                 ocpplugin-csit-1node-scalability-only-{stream},
@@ -141,11 +143,6 @@
                 lispflowmapping-csit-1node-msmr-all-{stream},
                 nemo-csit-1node-engine-all-{stream},
                 nemo-csit-1node-engine-only-{stream},
-                netconf-csit-1node-userfeatures-all-{stream},
-                netconf-csit-1node-userfeatures-only-{stream},
-                netvirt-csit-1node-openstack-basic-only-{stream},
-                netvirt-csit-1node-openstack-basic-all-{stream},
-                netvirt-csit-3node-clustering-only-{stream},
                 nic-csit-1node-basic-all-{stream},
                 nic-csit-1node-basic-only-{stream},
                 openflowplugin-csit-1node-flow-services-only-{stream},
@@ -176,6 +173,8 @@
                 vtn-csit-1node-manager-all-{stream},
                 vtn-csit-1node-coordinator-only-{stream}
 
+    # tools system image
+    tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20161031-0804
 
 # Template: integration-csit-verify-1node-library
 # Goal: Verify changes in csit folder not covered by projects suite verify jobs (e.g. libraries or variables)
@@ -187,11 +186,9 @@
     project-type: freestyle
     node: centos7-robot-2c-2g
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
         - opendaylight-infra-parameters:
@@ -199,23 +196,26 @@
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
             artifacts: '{archive-artifacts}'
+        # when upgrading to carbon you should replace odl-netconf-connector-all with odl-netconf-topology from
+        # controller-features and change USE_NETCONF_CONNECTOR to False in test-options
         - integration-branch:
             branch: 'stable/boron'
         - integration-distribution-stream:
             stream: 'boron'
         - integration-bundleurl:
-            bundleurl: 'last'
+            bundleurl: '{bundleurl}'
         - integration-controller-scope:
             controller-scope: 'only'
         - integration-controller-features:
             controller-features: >
                 odl-clustering-test-app,
                 odl-openflowplugin-flow-services-ui,
+                odl-openflowplugin-app-table-miss-enforcer,
                 odl-bgpcep-pcep,
                 odl-bgpcep-bgp,
                 odl-netconf-connector-all
         - integration-test-options:
-            test-options: '-v TIMEOUT_BUG_4220:10s'
+            test-options: '-v TIMEOUT_BUG_4220:10s -v USE_NETCONF_CONNECTOR:True'
         - integration-stream-test-plan:
             stream-test-plan: 'test-libraries-boron.txt'
         - integration-test-plan:
@@ -234,21 +234,23 @@
     wrappers:
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
-        - integration-jclouds-controller-mininet:
-            controller-image: '{controller-image}'
-            controller-vms: 1
-            mininet-image: '{mininet-image}'
-            mininet-vms: '{mininet-vms}'
 
     triggers:
         - integration-trigger-patch-submitted:
-            name: 'integration/test'
+            server: '{server-name}'
+            project: '{project}'
             branch: 'master'
-            pattern: 'csit/libraries/*'
+            files: 'csit/libraries/*'
 
     builders:
-        - integration-copy-ssh-keys
-        - integration-cleanup-workspace
+        - integration-infra-stack:
+            stack-template: '{stack-template}'
+            vm_0_count: '1'
+            vm_0_flavor: '{odl_system_flavor}'
+            vm_0_image: '{odl_system_image}'
+            vm_1_count: '{tools_system_count}'
+            vm_1_flavor: '{tools_system_flavor}'
+            vm_1_image: '{tools_system_image}'
         - integration-install-robotframework
         - inject:
             properties-file: 'env.properties'
@@ -266,6 +268,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[integration]'
         - integration-csit-archive-build
         - opendaylight-infra-shiplogs:
@@ -281,15 +284,13 @@
     project-type: freestyle
     node: centos7-java-builder-2c-8g
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
         - integration-bundleurl:
-            bundleurl: 'last'
+            bundleurl: '{bundleurl}'
         - integration-jdk-version:
             jdkversion: '{jre}'
 
@@ -305,6 +306,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[integration]'
 
 # Template: integration-patch-test-{stream}
@@ -319,11 +321,9 @@
     node: centos7-java-builder-2c-8g
     jdk: '{jdk}'
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
         - opendaylight-infra-parameters:
@@ -333,7 +333,8 @@
             artifacts: '{archive-artifacts} **/dependency_tree.txt'
         - integration-branch:
             branch: '{branch}'
-        - integration-distribution-git-url
+        - integration-distribution-git-url:
+            git-url: '{git-url}'
 
     scm:
         - integration-gerrit-scm:
@@ -345,11 +346,11 @@
 
     wrappers:
         - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
+            build-timeout: '720'
 
     triggers:
         - gerrit:
-            server-name: 'OpenDaylight'
+            server-name: '{server-name}'
             trigger-on:
                 - comment-added-contains-event:
                     comment-contains-value: 'test-integration'
@@ -408,6 +409,7 @@
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[$GERRIT_PROJECT]'
 
 # Template: integration-multipatch-test-{stream}
@@ -423,11 +425,9 @@
     node: centos7-java-builder-8c-8g
     jdk: '{jdk}'
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
         - patches-to-build-parameter:
@@ -476,4 +476,5 @@
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[int/dist]'