Update CentOS7 images for change 56476

[releng/builder.git] / jjb / netvirt / netvirt-csit-hwvtep-openstack.yaml

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 437289b6866b0473b37a0db17fa2dd7ea19dd7a6..b16a5019120a79b5eb316cecf79cc327f1d6719c 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -1,93 +1,68 @@
+---
 - project:
     name: netvirt-csit-hwvtep-openstack-integration
     jobs:
-        - '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
 
     project: 'netvirt'
 
     topology:
-        - 1node:
-            openstack_system_count: 3
-            odl_system_count: 1
-            enable-haproxy: 'no'
-            install-features: 'odl-netvirt-openstack'
-        - 3node:
-            openstack_system_count: 4
-            odl_system_count: 3
-            enable-haproxy: 'yes'
-            install-features: 'odl-jolokia,odl-netvirt-openstack'
-
-    testplan: '{project}-{topology}-openstack.txt'
+      - 1node:
+          openstack_system_count: 3
+          odl_system_count: 1
+          enable-haproxy: 'no'
+          install-features: 'odl-netvirt-openstack'
+      - 3node:
+          openstack_system_count: 4
+          odl_system_count: 3
+          enable-haproxy: 'yes'
+          install-features: 'odl-jolokia,odl-netvirt-openstack'
+
+    testplan: '{project}-{topology}-l2gw-openstack.txt'
 
     functionality:
-        - upstream-transparent:
-            schedule: 'H H * * *'
-            sg-mode: 'transparent'
-        - upstream-stateful:
-            schedule: 'H H * * *'
-            sg-mode: 'stateful'
-        - upstream-learn:
-            schedule: 'H H * * *'
-            sg-mode: 'learn'
-        - gate-learn:
-            schedule: ''
-            sg-mode: 'learn'
-        - gate-transparent:
-            schedule: ''
-            sg-mode: 'transparent'
-        - gate-stateful:
-            schedule: ''
-            sg-mode: 'stateful'
-        - gate-minimal-transparent:
-            schedule: ''
-            sg-mode: 'transparent'
-            testplan: '{project}-{topology}-minimal-openstack.txt'
-        - gate-tempest-transparent:
-            schedule: ''
-            sg-mode: 'transparent'
-            testplan: '{project}-{topology}-tempest-openstack.txt'
+      - upstream-transparent:
+          schedule: ''
+          sg-mode: 'transparent'
+      - upstream-stateful:
+          schedule: ''
+          sg-mode: 'stateful'
+      - upstream-learn:
+          schedule: ''
+          sg-mode: 'learn'
 
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
+      - nitrogen:
+          branch: 'master'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
+      - boron:
+          branch: 'stable/boron'
+          jre: 'openjdk8'
+          karaf-version: karaf3
 
     openstack:
-        - mitaka:
-            openstack-branch: 'stable/mitaka'
-            odl-ml2-branch: 'stable/mitaka'
-            odl-ml2-driver-version: 'v1'
-            openstack_system_image: 'CentOS 7 - devstack-mitaka - 20170210-1356'
-        - newton:
-            openstack-branch: 'stable/newton'
-            odl-ml2-branch: 'stable/newton'
-            odl-ml2-driver-version: 'v1'
-            openstack_system_image: 'CentOS 7 - devstack-newton - 20170210-1344'
-        - newton-nodl-v2:
-            openstack-branch: 'stable/newton'
-            odl-ml2-branch: 'stable/newton'
-            odl-ml2-driver-version: 'v2'
-            openstack_system_image: 'CentOS 7 - devstack-newton - 20170210-1344'
+      - newton:
+          openstack-branch: 'stable/newton'
+          odl-ml2-branch: 'stable/newton'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
+      - newton-nodl-v2:
+          openstack-branch: 'stable/newton'
+          odl-ml2-branch: 'stable/newton'
+          odl-ml2-driver-version: 'v2'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
 
     tools_system_count: 2
 
-    tools_system_image: 'Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300'
-
-    odl-enable-l3: 'yes'
-
-    public-bridge: 'br-physnet1'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170406-0546'
 
-    public-physical-network: 'physnet1'
+    odl_system_image: 'CentOS 7 - java-builder - 20170503-2232'
 
-    enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
+    enable-networking-l2gw: 'yes'
 
-    disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'
-
-    tenant-network-type: 'vxlan'
+    enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest,l2gw-plugin'
 
     security-group-mode: '{sg-mode}'
-
-    robot-options: ''