Update the set of jobs to match what ovn-kubernetes is currently
running.  We don't run everything though, just the conformance and
control-plane tests.

This is based on the following revision of ovn-kubernetes:
https://github.com/ovn-org/ovn-kubernetes/tree/ac329f818509

Signed-off-by: Dumitru Ceara <[email protected]>
---
 .github/workflows/ovn-kubernetes.yml |   45 +++++++++++++++++++++++++++-------
 1 file changed, 36 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ovn-kubernetes.yml 
b/.github/workflows/ovn-kubernetes.yml
index 3304ab2eaf..32de123918 100644
--- a/.github/workflows/ovn-kubernetes.yml
+++ b/.github/workflows/ovn-kubernetes.yml
@@ -68,31 +68,58 @@ jobs:
       fail-fast: false
       matrix:
         # Valid options are:
-        # target: ["shard-conformance", "control-plane" ]
+        # target: ["shard-conformance", "control-plane", "multi-homing", 
"multi-node-zones", "node-ip-migration", "compact-mode"]
         #         shard-conformance: hybrid-overlay = multicast-enable = 
emptylb-enable = false
         #         control-plane: hybrid-overlay = multicast-enable = 
emptylb-enable = true
+        # ha: ["HA", "noHA"]
         # gateway-mode: ["local", "shared"]
         # ipfamily: ["ipv4", "ipv6", "dualstack"]
         # disable-snat-multiple-gws: ["noSnatGW", "snatGW"]
+        # second-bridge: ["2br", "1br"]
+        # ic: ["ic-disabled", "ic-single-node-zones", "ic-multi-node-zones"]
+        # num-workers : "<integer value>"
+        # num-nodes-per-zone : "<integer value>"
         include:
-          - {"target": "shard-conformance", "ha": "HA",   "gateway-mode": 
"local",  "ipfamily": "ipv6",      "disable-snat-multiple-gws": "snatGW"}
-          - {"target": "shard-conformance", "ha": "HA",   "gateway-mode": 
"local",  "ipfamily": "dualstack", "disable-snat-multiple-gws": "snatGW"}
-          - {"target": "shard-conformance", "ha": "HA",   "gateway-mode": 
"shared", "ipfamily": "ipv4",      "disable-snat-multiple-gws": "snatGW"}
-          - {"target": "shard-conformance", "ha": "HA",   "gateway-mode": 
"shared", "ipfamily": "ipv6",      "disable-snat-multiple-gws": "snatGW"}
-          - {"target": "control-plane",     "ha": "HA",   "gateway-mode": 
"shared", "ipfamily": "ipv4",      "disable-snat-multiple-gws": "noSnatGW"}
-          - {"target": "control-plane",     "ha": "HA",   "gateway-mode": 
"shared", "ipfamily": "ipv4",      "disable-snat-multiple-gws": "snatGW"}
+          - {"target": "shard-conformance", "ha": "HA",   "gateway-mode": 
"local",  "ipfamily": "ipv6",      "disable-snat-multiple-gws": "snatGW",   
"second-bridge": "1br", "ic": "ic-disabled"}
+          - {"target": "shard-conformance", "ha": "HA",   "gateway-mode": 
"shared", "ipfamily": "ipv4",      "disable-snat-multiple-gws": "snatGW",   
"second-bridge": "1br", "ic": "ic-disabled"}
+          - {"target": "shard-conformance", "ha": "noHA", "gateway-mode": 
"local",  "ipfamily": "dualstack", "disable-snat-multiple-gws": "snatGW",   
"second-bridge": "1br", "ic": "ic-single-node-zones"}
+          - {"target": "shard-conformance", "ha": "noHA", "gateway-mode": 
"shared", "ipfamily": "ipv6",      "disable-snat-multiple-gws": "snatGW",   
"second-bridge": "1br", "ic": "ic-single-node-zones"}
+          - {"target": "shard-conformance", "ha": "noHA", "gateway-mode": 
"shared", "ipfamily": "ipv4",      "disable-snat-multiple-gws": "snatGW",   
"second-bridge": "1br", "ic": "ic-single-node-zones"}
+          - {"target": "control-plane",     "ha": "HA",   "gateway-mode": 
"shared", "ipfamily": "ipv4",      "disable-snat-multiple-gws": "noSnatGW", 
"second-bridge": "1br", "ic": "ic-disabled"}
+          - {"target": "control-plane",     "ha": "HA",   "gateway-mode": 
"shared", "ipfamily": "ipv4",      "disable-snat-multiple-gws": "snatGW",   
"second-bridge": "1br", "ic": "ic-disabled"}
+          - {"target": "control-plane",     "ha": "noHA", "gateway-mode": 
"local",  "ipfamily": "ipv4",      "disable-snat-multiple-gws": "noSnatGW", 
"second-bridge": "1br", "ic": "ic-single-node-zones"}
+          - {"target": "control-plane",     "ha": "noHA", "gateway-mode": 
"shared", "ipfamily": "ipv4",      "disable-snat-multiple-gws": "noSnatGW", 
"second-bridge": "2br", "ic": "ic-single-node-zones"}
+          # The following ovn-kubernetes lanes are skipped to avoid testing 
everything twice
+          # (once in ovn-org/ovn and once in ovn-org/ovn-kubernetes).
+          # - {"target": "node-ip-migration", "ha": "noHA", "gateway-mode": 
"shared", "ipfamily": "ipv6",      "disable-snat-multiple-gws": "SnatGW",   
"second-bridge": "1br", "ic": "ic-disabled"}
+          # - {"target": "node-ip-migration", "ha": "noHA", "gateway-mode": 
"shared", "ipfamily": "ipv4",      "disable-snat-multiple-gws": "SnatGW",   
"second-bridge": "1br", "ic": "ic-single-node-zones"}
+          # - {"target": "compact-mode",      "ha": "noHA", "gateway-mode": 
"local",  "ipfamily": "ipv4",      "disable-snat-multiple-gws": "snatGW",   
"second-bridge": "1br", "ic": "ic-disabled"}
+          # - {"target": "multi-homing",      "ha": "noHA", "gateway-mode": 
"local",  "ipfamily": "dualstack", "disable-snat-multiple-gws": "SnatGW",   
"second-bridge": "1br", "ic": "ic-single-node-zones"}
+          # - {"target": "multi-node-zones",  "ha": "noHA", "gateway-mode": 
"local",  "ipfamily": "ipv4",      "disable-snat-multiple-gws": "SnatGW",   
"second-bridge": "1br", "ic": "ic-multi-node-zones", "num-workers": "3", 
"num-nodes-per-zone": "2"}
+          # - {"target": "external-gateway",  "ha": "noHA", "gateway-mode": 
"shared", "ipfamily": "ipv4",      "disable-snat-multiple-gws": "noSnatGW", 
"second-bridge": "2br", "ic": "ic-single-node-zones"}
+          # - {"target": "external-gateway",  "ha": "noHA", "gateway-mode": 
"local",  "ipfamily": "ipv4",      "disable-snat-multiple-gws": "noSnatGW", 
"second-bridge": "1br", "ic": "ic-single-node-zones"}
+          # - {"target": "kv-live-migration", "ha": "noHA", "gateway-mode": 
"local",  "ipfamily": "ipv4",      "disable-snat-multiple-gws": "SnatGW",   
"second-bridge": "1br", "ic": "ic-disabled"}
+          # - {"target": "kv-live-migration", "ha": "noHA", "gateway-mode": 
"shared", "ipfamily": "dualstack", "disable-snat-multiple-gws": "SnatGW",   
"second-bridge": "1br", "ic": "ic-single-node-zones"}
     needs: [build]
     env:
       JOB_NAME: "${{ matrix.target }}-${{ matrix.ha }}-${{ matrix.gateway-mode 
}}-${{ matrix.ipfamily }}-${{ matrix.disable-snat-multiple-gws }}-${{ 
matrix.second-bridge }}"
       OVN_HYBRID_OVERLAY_ENABLE: "${{ matrix.target == 'control-plane' }}"
-      KIND_INSTALL_METALLB: "${{ matrix.target == 'control-plane' }}"
       OVN_MULTICAST_ENABLE:  "${{ matrix.target == 'control-plane' }}"
       OVN_EMPTY_LB_EVENTS: "${{ matrix.target == 'control-plane' }}"
-      OVN_HA: "true"
+      OVN_HA: "${{ matrix.ha == 'HA' }}"
       OVN_DISABLE_SNAT_MULTIPLE_GWS: "${{ matrix.disable-snat-multiple-gws == 
'noSnatGW' }}"
+      KIND_INSTALL_METALLB: "${{ matrix.target == 'control-plane' }}"
       OVN_GATEWAY_MODE: "${{ matrix.gateway-mode }}"
+      OVN_SECOND_BRIDGE: "${{ matrix.second-bridge == '2br' }}"
       KIND_IPV4_SUPPORT: "${{ matrix.ipfamily == 'IPv4' || matrix.ipfamily == 
'dualstack' }}"
       KIND_IPV6_SUPPORT: "${{ matrix.ipfamily == 'IPv6' || matrix.ipfamily == 
'dualstack' }}"
+      ENABLE_MULTI_NET: "${{ matrix.target == 'multi-homing' }}"
+      KIND_INSTALL_KUBEVIRT: "${{ matrix.target == 'kv-live-migration' }}"
+      OVN_COMPACT_MODE: "${{ matrix.target == 'compact-mode' }}"
+      OVN_DUMMY_GATEWAY_BRIDGE: "${{ matrix.target == 'compact-mode' }}"
+      OVN_ENABLE_INTERCONNECT: "${{ matrix.ic == 'ic-single-node-zones' ||  
matrix.ic == 'ic-multi-node-zones'}}"
+      KIND_NUM_WORKER: "${{ matrix.num-workers }}"
+      KIND_NUM_NODES_PER_ZONE: "${{ matrix.num-nodes-per-zone }}"
     steps:
 
     - name: Check out ovn

_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to