add SG mode parameter for netvirt jobs

Change-Id: I2c457f5682006a52b95149101919466ff6b72e30
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
index 6657f82c34b6c5f6f3c66d7f2d619970912bb6e5..e0d300e249cfeba904db7e1681fa9b7f8e5f898c 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
@@ -44,3 +44,5 @@
     disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'
 
     tenant-network-type: 'vxlan'
+
+    security-group-mode: 'none'
\ No newline at end of file

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 6779112128bd4516071a626c9260128980148056..75237d852d891035b6caac7d5cef1e9db32a76ae 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -816,6 +816,10 @@
             name: TENANT_NETWORK_TYPE
             default: '{tenant-network-type}'
             description: 'Tenant Network Type supported by the implementation'
+        - string:
+            name: SECURITY_GROUP_MODE
+            default: '{security-group-mode}'
+            description: 'Security Group Mode to be used in netvirt aclservice config'
     scm:
         - integration-gerrit-scm:
             basedir: 'test'
@@ -929,6 +933,11 @@
             name: TENANT_NETWORK_TYPE
             default: '{tenant-network-type}'
             description: 'Tenant Network Type supported by the implementation'
+        - string:
+            name: SECURITY_GROUP_MODE
+            default: '{security-group-mode}'
+            description: 'Security Group Mode to be used in netvirt aclservice config'
+
     scm:
         - integration-gerrit-scm:
             basedir: 'test'

diff --git a/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
index 5927d2911cd2905e54e402cacb8cf87fbf7a3d34..2ea4cbef5ecdf6e6ada483de2615a3de1c9e0848 100644 (file)
--- a/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
@@ -43,3 +43,5 @@
     disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'
 
     tenant-network-type: 'vxlan'
+
+    security-group-mode: 'none'
\ No newline at end of file

diff --git a/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
index fc1c774a5b9ae1b4fd98fc4b1330b9c288525e50..b00958e85c1a625d335fd0581d9a35969cc05b9a 100644 (file)
--- a/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
@@ -45,3 +45,5 @@
     disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'
 
     tenant-network-type: 'vxlan'
+
+    security-group-mode: 'none'
\ No newline at end of file

diff --git a/jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml b/jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml
index fac01da37e52b21a709e22992bff8e5611e7e92b..49a7f576a9ea26c9a345ebe83db659e8d2bc7f25 100644 (file)
--- a/jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml
@@ -40,3 +40,5 @@
     disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'
 
     tenant-network-type: 'vxlan'
+
+    security-group-mode: 'transparent'

diff --git a/jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml b/jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml
index 876f099939a2972e28da64124027ade623ce53cc..0b30c126c72488f49a9b28f10462bca9b6ec5bbe 100644 (file)
--- a/jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml
@@ -42,3 +42,5 @@
     disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'
 
     tenant-network-type: 'vxlan'
+
+    security-group-mode: 'transparent'
\ No newline at end of file

diff --git a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
index 87f0a00b619b056300ab2c482c8e43fc6ae2c34a..d95339893a0e0b50214c2d7c31872aa74ed635c8 100644 (file)
--- a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
+++ b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
@@ -43,3 +43,5 @@
     disable-openstack-services: 'n-net,q-l3'
 
     tenant-network-type: 'local'
+
+    security-group-mode: 'none'
\ No newline at end of file