Merge "Update global-jjb to the latest v0.56.0"

[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 c71f008464c44231066f3d2435a2db44a380ff52..264a3a018a2bc82fbb254bf28a7df8b84c8c8d5d 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
@@ -2,40 +2,43 @@
 - project:
     name: groupbasedpolicy-csit-openstack-integration
     jobs:
-      - inttest-csit-openstack
+      - inttest-csit-openstack-custom
 
     # The project name
-    project: 'groupbasedpolicy'
+    project: "groupbasedpolicy"
+    disable-job: true
 
     topology:
       - 1node:
           openstack_system_count: 1
           odl_system_count: 1
-          enable-haproxy: 'no'
+          enable-haproxy: "no"
 
-    testplan: '{project}-{topology}-openstack.txt'
+    testplan: "{project}-{topology}-openstack.txt"
 
     # The project name
-    functionality: 'openstack'
+    functionality: "openstack"
 
     stream:
-      - fluorine:
-          branch: 'master'
-          install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
-      - oxygen:
-          branch: 'stable/oxygen'
-          install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
+      - silicon:
+          branch: "master"
+          jre: "openjdk11"
+      - aluminium:
+          branch: "stable/aluminium"
+          jre: "openjdk11"
+      - magnesium:
+          branch: "stable/magnesium"
+          jre: "openjdk11"
+      - sodium:
+          branch: "stable/sodium"
 
     openstack:
-      - ocata:
-          openstack-branch: 'stable/ocata'
-          odl-ml2-branch: 'stable/ocata'
+      - queens:
+          openstack-branch: "stable/queens"
+          odl-ml2-branch: "stable/queens"
 
-    public-bridge: 'br-int'
+    public-bridge: "br-int"
 
-    enable-openstack-plugins: 'networking-odl'
+    enable-openstack-plugins: "networking-odl"
 
-    security-group-mode: 'none'
+    security-group-mode: "none"