Merge "Add system test jobs into integration-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 9344513af61c4707bff68b89c2e4eae7c98ca54a..f7e41ee30e08d1af3c939a2bd6f1ac3e2b97c7ac 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -28,16 +28,19 @@
                 netvirt-csit-1node-openstack-basic-only-{stream},
                 netvirt-csit-1node-openstack-basic-all-{stream},
                 netvirt-csit-3node-clustering-only-{stream},
+                ocpplugin-csit-1node-get-only-{stream},
+                ocpplugin-csit-1node-get-all-{stream},
+                ocpplugin-csit-1node-scalability-only-{stream},
+                ocpplugin-csit-1node-scalability-all-{stream},
                 openflowplugin-csit-1node-flow-services-only-{stream},
-                openflowplugin-csit-1node-flow-services-lithium-redesign-only-{stream},
+                openflowplugin-csit-1node-flow-services-helium-redesign-only-{stream},
                 openflowplugin-csit-1node-flow-services-all-{stream},
                 openflowplugin-csit-1node-scalability-only-{stream},
-                openflowplugin-csit-1node-scalability-lithium-redesign-only-{stream},
-                openflowplugin-csit-1node-scalability-all-{stream},
+                openflowplugin-csit-1node-scalability-helium-redesign-only-{stream},
                 openflowplugin-csit-1node-cbench-performance-only-{stream},
-                openflowplugin-csit-1node-cbench-performance-lithium-redesign-only-{stream},
+                openflowplugin-csit-1node-cbench-performance-helium-redesign-only-{stream},
                 openflowplugin-csit-1node-config-performance-only-{stream},
-                openflowplugin-csit-1node-config-performance-lithium-redesign-only-{stream},
+                openflowplugin-csit-1node-config-performance-helium-redesign-only-{stream},
                 ovsdb-csit-1node-southbound-all-{stream},
                 ovsdb-csit-1node-southbound-only-{stream},
                 packetcable-csit-1node-pcmm-only-{stream},
@@ -90,7 +93,6 @@
                 openflowplugin-csit-1node-flow-services-all-{stream},
                 openflowplugin-csit-1node-scalability-only-{stream},
                 openflowplugin-csit-1node-scalability-lithium-redesign-only-{stream},
-                openflowplugin-csit-1node-scalability-all-{stream},
                 openflowplugin-csit-1node-cbench-performance-only-{stream},
                 openflowplugin-csit-1node-cbench-performance-lithium-redesign-only-{stream},
                 openflowplugin-csit-1node-config-performance-only-{stream},
@@ -147,7 +149,6 @@
                 openflowplugin-csit-1node-flow-services-all-{stream},
                 openflowplugin-csit-1node-scalability-only-{stream},
                 openflowplugin-csit-1node-scalability-lithium-redesign-only-{stream},
-                openflowplugin-csit-1node-scalability-all-{stream},
                 openflowplugin-csit-1node-cbench-performance-only-{stream},
                 openflowplugin-csit-1node-cbench-performance-lithium-redesign-only-{stream},
                 openflowplugin-csit-1node-config-performance-only-{stream},
@@ -220,11 +221,11 @@
 
     wrappers:
         - build-timeout
-        - integration-jclouds-controller-mininet:
+        - integration-openstack-controller-mininet:
+            controller-image: '{controller-image}'
             controller-vms: 1
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
-            mininet-cloud-name: '{mininet-cloud-name}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -253,10 +254,11 @@
         - integration-robot:
             unstable-if: 0.0
             pass-if: 100.0
-        - archive:
-            artifacts: '*.log,*.log.xz'
         - email-notification:
             email-prefix: '[integration]'
+        - integration-csit-archive-build
+        - archive-build:
+            maven-version: '{mvn33}'
 
 # Template: integration-distribution-test-{stream}
 # Goal: Verify a distribution through all system test available
@@ -364,30 +366,34 @@
             properties-file: 'bundle.txt'
         - wipe-org-opendaylight-repo
         - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{integration-settings}'
+            global-settings-file: 'odl-global-settings'
+            settings-file: 'integration-settings'
         - maven-target:
             maven-version: '{mvn33}'
             pom: '$GERRIT_PROJECT/pom.xml'
             goals: 'clean install -V -B -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
             java-opts:
                 - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-            global-settings: '{odl-global-settings}'
-            settings: '{integration-settings}'
+            settings: 'integration-settings'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'distribution/pom.xml'
         goals: 'clean install -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-        global-settings: '{odl-global-settings}'
-        settings: '{integration-settings}'
+        settings: 'integration-settings'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
         ignore-upstream-changes: true
         post-step-run-condition: 'SUCCESS'
 
     postbuilders:
         - trigger-builds:
-            - project: 'integration-distribution-test-{stream}'
+            - project: '{csit-list}'
               block: true
               predefined-parameters:
                   BUNDLEURL=$BUNDLEURL
@@ -433,8 +439,8 @@
         - inject:
             properties-file: 'bundle.txt'
         - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{yangtools-settings}'
+            global-settings-file: 'odl-global-settings'
+            settings-file: 'yangtools-settings'
 
     maven:
         maven-name: '{mvn33}'
@@ -442,13 +448,15 @@
         # TODO: Make Maven options configurable. Currently tests are not skipped, everything else is.
         goals: 'clean install -f patch_tester/pom.xml -V -B -Djenkins -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-        global-settings: '{odl-global-settings}'
-        settings: '{yangtools-settings}'
+        settings: 'yangtools-settings'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
         post-step-run-condition: 'SUCCESS'
 
     postbuilders:
         - trigger-builds:
-            - project: 'integration-distribution-test-{stream}'
+            - project: '{csit-list}'
               block: true
               predefined-parameters:
                   BUNDLEURL=$BUNDLEURL