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 3bc42fc1c85e07107fae55ac69714a8b735cc9b8..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'
@@ -21,29 +21,19 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
           install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
           install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-          install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
           karaf-version: karaf3
           install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
 
     openstack:
       - newton:
-          openstack-branch: 'stable/newton'
-          odl-ml2-branch: 'stable/newton'
-
-    schedule: 'H H * * *'
+          openstack-branch: 'stable/ocata'
+          odl-ml2-branch: 'stable/ocata'
 
     public-bridge: 'br-int'