Merge "Update to global-jjb v0.22.1"

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 80d6d72a240925541e9787ed2222e2297e592e4d..6d6f192dd579354956ffacb41dc8b9f45d63fbc2 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -66,6 +66,9 @@
     odl-snat-mode: 'controller'
     enable-itm-direct-tunnels: 'false'
     openstack_legacy_default_network_services: 'q-dhcp,q-meta,q-svc'
+    os-cmb-cnt: 1
+    os-ctl-cnt: 0
+    os-cmp-cnt: 0
 
     # openstack-infra-parameters defaults
     archive-artifacts: ''
@@ -194,9 +197,9 @@
 
     # Manual CSIT job lists used by sanity or periodic in nature.
     csit-high-frequency-list-fluorine: >
-        netvirt-csit-1node-openstack-queens-upstream-stateful-fluorine
+        netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-fluorine
     csit-high-frequency-list-oxygen: >
-        netvirt-csit-1node-openstack-queens-upstream-stateful-oxygen
+        netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-oxygen
     csit-sanity-list-fluorine: >
         openflowplugin-csit-1node-sanity-only-fluorine,
         distribution-sanity-fluorine

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index becacd07e4b69df9b2ff7c96470825f14b834d7e..5536f211d9bc450fd509aa8b5afbb7d2f3507e21 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -62,6 +62,10 @@
           controller-features: '{install-features}'
       - integration-test-options:
           test-options: '{robot-options}'
+      - integration-script-plan:
+          script-plan: '{scriptplan}'
+      - integration-config-plan:
+          config-plan: '{configplan}'
       - integration-stream-test-plan:
           stream-test-plan: '{project}-{functionality}-{verify-stream}.txt'
       - integration-test-plan:
@@ -156,6 +160,10 @@
           controller-debug-map: '{debug-map}'
       - integration-test-options:
           test-options: '{robot-options}'
+      - integration-script-plan:
+          script-plan: '{scriptplan}'
+      - integration-config-plan:
+          config-plan: '{configplan}'
       - integration-stream-test-plan:
           stream-test-plan: '{streamtestplan}'
       - integration-test-plan:
@@ -392,6 +400,10 @@
           controller-features: 'odl-jolokia,{install-features}'
       - integration-test-options:
           test-options: '{robot-options}'
+      - integration-script-plan:
+          script-plan: '{scriptplan}'
+      - integration-config-plan:
+          config-plan: '{configplan}'
       - integration-stream-test-plan:
           stream-test-plan: '{project}-{functionality}-{verify-stream}.txt'
       - integration-test-plan:
@@ -490,6 +502,10 @@
           controller-debug-map: '{debug-map}'
       - integration-test-options:
           test-options: '{robot-options}'
+      - integration-script-plan:
+          script-plan: '{scriptplan}'
+      - integration-config-plan:
+          config-plan: '{configplan}'
       - integration-stream-test-plan:
           stream-test-plan: '{streamtestplan}'
       - integration-test-plan:
@@ -722,6 +738,10 @@
           controller-features: 'odl-jolokia,{install-features}'
       - integration-test-options:
           test-options: '{robot-options}'
+      - integration-script-plan:
+          script-plan: '{scriptplan}'
+      - integration-config-plan:
+          config-plan: '{configplan}'
       - integration-stream-test-plan:
           stream-test-plan: '{project}-{functionality}-{stream}.txt'
       - integration-test-plan:
@@ -1025,7 +1045,8 @@
       - lf-infra-publish
 
 - job-template:
-    name: '{prefix}{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+    name: '{prefix}{project}-csit-{topology}-
+    {os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-openstack-{openstack}-{functionality}-{stream}'
     id: inttest-csit-openstack
     disabled: false
 

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
index 79aae6af56c228bbd566fd3b7d46012a6c63e7cb..d139aeb3c6d847ae5dea260778b18113564d8b9a 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
@@ -15,6 +15,9 @@
     odl_system_flavor: odl-highcpu-8
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
+    os-cmb-cnt: 0
+    os-ctl-cnt: 1
+    os-cmp-cnt: 2
 
     topology:
       - 1node:

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index e34481ca68824d22e1a0eed09a11ecfc1c46e49c..82861624dddeb15e9fb13f359f72ff033a5d87e2 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -15,6 +15,9 @@
     odl_system_flavor: odl-highcpu-8
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
+    os-cmb-cnt: 0
+    os-ctl-cnt: 1
+    os-cmp-cnt: 2
 
     topology:
       - 1node:
@@ -94,6 +97,9 @@
     odl_system_flavor: odl-highcpu-8
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
+    os-cmb-cnt: 0
+    os-ctl-cnt: 1
+    os-cmp-cnt: 2
 
     topology:
       - 1node:
@@ -166,6 +172,9 @@
     security-group-mode: 'stateful'
     odl_system_flavor: odl-highcpu-4
     openstack_system2_flavor: odl-highcpu-2
+    os-cmb-cnt: 0
+    os-ctl-cnt: 1
+    os-cmp-cnt: 2
 
     topology:
       - 1node: