Merge "Don't allow retry to fail stacking"

[releng/builder.git] / jjb / groupbasedpolicy / groupbasedpolicy-csit-1node-openstack.yaml

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
index 4d42d19cd478f3093dad543717c667eec9c51d69..208341cb8a4c72aa5e1101721db66fcca9c67329 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
@@ -2,7 +2,7 @@
 - project:
     name: groupbasedpolicy-csit-openstack-integration
     jobs:
-      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - inttest-csit-openstack
 
     # The project name
     project: 'groupbasedpolicy'
@@ -32,8 +32,8 @@
 
     openstack:
       - newton:
-          openstack-branch: 'stable/newton'
-          odl-ml2-branch: 'stable/newton'
+          openstack-branch: 'stable/ocata'
+          odl-ml2-branch: 'stable/ocata'
 
     public-bridge: 'br-int'