Merge "Add stein devstack jobs"

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 73d7eeaeb39e10237c7d3843fd2adc59b1d8b13d..c2c92203723ac0d0b5af45c6c360922ed3a2848c 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -86,6 +86,7 @@
     elasticsearch-attribute: 'disabled'
 
     # CSIT images configuration
+    openstack_stein_system_image: ZZCI - CentOS 7 - devstack-stein - x86_64 - 20190628-065204.973
     openstack_rocky_system_image: ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20191002-183226.559
     openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - x86_64 - 20191004-045555.756
 

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 75f999608e6a323e1cc14aa3e5f60ab9cbab50a7..813abc6b5efe31ec3dc3186580a210aefe2abac9 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -247,12 +247,12 @@
           odl-snat-mode: 'conntrack'
 
     openstack:
-      - queens:
-          openstack-branch: 'stable/queens'
-          odl-ml2-branch: 'stable/queens'
+      - stein:
+          openstack-branch: 'stable/stein'
+          odl-ml2-branch: 'stable/stein'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_queens_system_image}'
-          openstack_system2_image: '{openstack_queens_system_image}'
+          openstack_system_image: '{openstack_stein_system_image}'
+          openstack_system2_image: '{openstack_stein_system_image}'
 
 - project:
     name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration
@@ -339,3 +339,9 @@
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
           openstack_system_image: '{openstack_rocky_system_image}'
           openstack_system2_image: '{openstack_rocky_system_image}'
+      - stein:
+          openstack-branch: 'stable/stein'
+          odl-ml2-branch: 'stable/stein'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          openstack_system_image: '{openstack_stein_system_image}'
+          openstack_system2_image: '{openstack_stein_system_image}'