Merge "Revert "Robot installation: Pinpoint pycparser version""

[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 205314d55062cf9da5cb71a86b55afc3ab0cf743..0c385654b14018bc129f5292dde4d4388fe9cfac 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -1,7 +1,7 @@
 - project:
     name: integration-test
     jobs:
-        - '{project-name}-verify-python-{stream}'
+        - '{project-name}-verify-tox-{stream}'
         - 'integration-csit-verify-1node-library'
         - 'integration-distribution-test-{stream}'
         - 'integration-patch-test-{stream}'
@@ -30,6 +30,8 @@
                 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},
                 ocpplugin-csit-1node-get-only-{stream},
                 ocpplugin-csit-1node-get-all-{stream},
@@ -43,6 +45,7 @@
                 openflowplugin-csit-3node-clustering-only-{stream},
                 ovsdb-csit-1node-southbound-all-{stream},
                 ovsdb-csit-1node-southbound-only-{stream},
+                ovsdb-csit-3node-clustering-only-{stream},
                 packetcable-csit-1node-pcmm-only-{stream},
                 packetcable-csit-1node-pcmm-all-{stream},
                 sxp-csit-1node-basic-only-{stream},
@@ -83,6 +86,8 @@
                 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},
                 ocpplugin-csit-1node-get-only-{stream},
                 ocpplugin-csit-1node-get-all-{stream},
@@ -96,6 +101,7 @@
                 openflowplugin-csit-3node-clustering-only-{stream},
                 ovsdb-csit-1node-southbound-all-{stream},
                 ovsdb-csit-1node-southbound-only-{stream},
+                ovsdb-csit-3node-clustering-only-{stream},
                 packetcable-csit-1node-pcmm-only-{stream},
                 packetcable-csit-1node-pcmm-all-{stream},
                 sxp-csit-1node-basic-only-{stream},
@@ -263,7 +269,7 @@
             email-prefix: '[integration]'
         - integration-csit-archive-build
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 # Template: integration-distribution-test-{stream}
 # Goal: Verify a distribution through all system test available
@@ -369,7 +375,7 @@
             global-settings-file: 'odl-global-settings'
             settings-file: 'integration-settings'
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             pom: '$GERRIT_PROJECT/pom.xml'
             goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Pq -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
             java-opts:
@@ -380,7 +386,7 @@
             global-settings-type: cfp
 
     maven:
-        maven-name: '{mvn33}'
+        maven-name: 'mvn33'
         root-pom: 'distribution/pom.xml'
         goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -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'
@@ -400,7 +406,7 @@
 
     publishers:
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
         - email-notification:
             email-prefix: '[$GERRIT_PROJECT]'
 
@@ -448,7 +454,7 @@
             build-timeout: '1200'
 
     maven:
-        maven-name: '{mvn33}'
+        maven-name: 'mvn33'
         root-pom: 'patch_tester/pom.xml'
         # TODO: Make Maven options configurable. Currently tests are not skipped, everything else is.
         goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -f patch_tester/pom.xml -V -B -Pq -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
@@ -468,6 +474,6 @@
 
     publishers:
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
         - email-notification:
             email-prefix: '[int/dist]'