Modified sanity,performance and regression workflows as per the 4.0 DUT target (#1016)

Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com>
2025-10-29 18:12:34 +00:00 · 2025-01-20 16:18:27 +05:30
parent 486498ce64
commit ad5541425e
3 changed files with 54 additions and 54 deletions
--- a/.github/workflows/performance.yml
+++ b/.github/workflows/performance.yml
@@ -22,7 +22,7 @@ on:
        description: "revision of the Open Wifi Helm chart"
      ap_models:
        required: true
-        default: "cig_wf186h,edgecore_eap104,cig_wf196,udaya_a6-id2,yuncore_ax820,edgecore_eap102,yuncore_fap655,cig_wf189,edgecore_eap105,sercomm_ap72tip,edgecore_eap101,edgecore_eap111"
+        default: "cig_wf186h,edgecore_eap104,cig_wf196,udaya_a6-id2,yuncore_ax820,hfcl_ion4xe,yuncore_fap655,cig_wf189,edgecore_eap105,sercomm_ap72tip,edgecore_eap101,edgecore_eap111"
        description: "the AP models to test"
      ap_version:
        required: true
@@ -130,7 +130,7 @@ jobs:

  # Run tests on APs
  test-cig-wf189:
-    needs: ["vars", "build", "test-yuncore-fap655" ]
+    needs: ["vars", "build", "test-cig-wf196" ]
    runs-on: [ self-hosted, small ]
    timeout-minutes: 1440
    if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'cig_wf189')"
@@ -333,13 +333,13 @@ jobs:
        run: kubectl -n openwifi-${{ needs.vars.outputs.existing_controller }} logs deployment/owsec


-  test-edgecore-eap102:
+  test-hfcl-ion4xe:
    needs: ["vars", "build", "test-yuncore-ax820" ]
    runs-on: [ self-hosted, small ]
    timeout-minutes: 1440
-    if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'edgecore_eap102')"
+    if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'hfcl_ion4xe')"
    env:
-      AP_MODEL: edgecore_eap102
+      AP_MODEL: hfcl_ion4xe
    steps:
      - name: Set AP model output
        id: ap_model
@@ -995,7 +995,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'dataplane_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-dtt
-          testbed: basic-4
+          testbed: basic-2
          marker_expression: "performance and dataplane_tests"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -1021,7 +1021,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'wifi_capacity_ax_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-wca
-          testbed: basic-4
+          testbed: basic-2
          marker_expression: "performance and wifi_capacity_ax_tests"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -1047,7 +1047,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'peak_throughput_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-ssdbt
-          testbed: basic-4
+          testbed: basic-2
          marker_expression: "performance and peak_throughput_tests"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -1073,7 +1073,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'client_scale_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-wct
-          testbed: basic-4
+          testbed: basic-2
          marker_expression: "performance and client_scale_tests"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -1099,7 +1099,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'dual_band_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-wct
-          testbed: basic-4
+          testbed: basic-2
          marker_expression: "performance and dual_band_tests"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -1607,7 +1607,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'dataplane_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-dtt
-          testbed: basic-2
+          testbed: basic-4
          marker_expression: "performance and dataplane_tests"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -1633,7 +1633,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'wifi_capacity_ax_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-wca
-          testbed: basic-2
+          testbed: basic-4
          marker_expression: "performance and wifi_capacity_ax_tests"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -1659,7 +1659,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'peak_throughput_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-ssdbt
-          testbed: basic-2
+          testbed: basic-4
          marker_expression: "performance and peak_throughput_tests"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -1685,7 +1685,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'client_scale_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-wct
-          testbed: basic-2
+          testbed: basic-4
          marker_expression: "performance and client_scale_tests"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -1711,7 +1711,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'dual_band_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-wct
-          testbed: basic-2
+          testbed: basic-4
          marker_expression: "performance and dual_band_tests"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -1960,7 +1960,7 @@ jobs:
        run: kubectl -n openwifi-${{ needs.vars.outputs.existing_controller }} logs deployment/owsec

  test-udaya-a6-id2:
-    needs: [ "vars", "build", "test-cig-wf196" ]
+    needs: [ "vars", "build", "test-yuncore-fap655" ]
    runs-on: [ self-hosted, small ]
    timeout-minutes: 1440
    if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'udaya_a6-id2')"
@@ -2573,7 +2573,7 @@ jobs:
  report:
    if: "!cancelled()"
    runs-on: ubuntu-latest
-    needs: [vars, test-cig-wf186h, test-edgecore-eap104, test-cig-wf196, test-udaya-a6-id2, test-yuncore-ax820, test-edgecore-eap102, test-yuncore-fap655, test-cig-wf189, test-edgecore-eap105, test-sercomm-ap72tip, test-edgecore-eap101, test-edgecore-eap111]
+    needs: [vars, test-cig-wf186h, test-edgecore-eap104, test-cig-wf196, test-udaya-a6-id2, test-yuncore-ax820, test-hfcl-ion4xe, test-yuncore-fap655, test-cig-wf189, test-edgecore-eap105, test-sercomm-ap72tip, test-edgecore-eap101, test-edgecore-eap111]
    strategy:
      fail-fast: false
      matrix:
@@ -2654,7 +2654,7 @@ jobs:

  # Cleanup
  cleanup:
-    needs: [test-cig-wf186h, test-edgecore-eap104, test-cig-wf196, test-udaya-a6-id2, test-yuncore-ax820, test-edgecore-eap102, test-yuncore-fap655, test-cig-wf189, test-edgecore-eap105, test-sercomm-ap72tip, test-edgecore-eap101, test-edgecore-eap111]
+    needs: [test-cig-wf186h, test-edgecore-eap104, test-cig-wf196, test-udaya-a6-id2, test-yuncore-ax820, test-hfcl-ion4xe, test-yuncore-fap655, test-cig-wf189, test-edgecore-eap105, test-sercomm-ap72tip, test-edgecore-eap101, test-edgecore-eap111]
    runs-on: ubuntu-latest
    if: always()
    steps:
--- a/.github/workflows/quali.yml
+++ b/.github/workflows/quali.yml
@@ -22,7 +22,7 @@ on:
        description: "revision of the Open Wifi Helm chart"
      ap_models:
        required: true
-        default: "cig_wf186h,edgecore_eap104,cig_wf196,udaya_a6-id2,yuncore_ax820,edgecore_eap102,yuncore_fap655,cig_wf189,edgecore_eap105,sercomm_ap72tip,edgecore_eap101,edgecore_eap111"
+        default: "cig_wf186h,edgecore_eap104,cig_wf196,udaya_a6-id2,yuncore_ax820,hfcl_ion4xe,yuncore_fap655,cig_wf189,edgecore_eap105,sercomm_ap72tip,edgecore_eap101,edgecore_eap111"
        description: "the AP models to test"
      ap_version:
        required: true
@@ -182,7 +182,7 @@ jobs:
        uses: ./.github/actions/run-tests
        with:
          namespace: ${{ steps.namespace.outputs.name }}
-          testbed: basic-2
+          testbed: basic-4
          marker_expression: "${{ needs.vars.outputs.marker_expression }}"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -271,7 +271,7 @@ jobs:
        uses: ./.github/actions/run-tests
        with:
          namespace: ${{ steps.namespace.outputs.name }}
-          testbed: basic-4
+          testbed: basic-2
          marker_expression: "${{ needs.vars.outputs.marker_expression }}"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -583,12 +583,12 @@ jobs:
        if: failure()
        run: kubectl -n openwifi-qa01 logs deployment/owsec

-  test-edgecore-eap102:
+  test-hfcl-ion4xe:
    needs: [ "vars", "build" ]
    runs-on: ubuntu-latest
-    if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'edgecore_eap102')"
+    if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'hfcl_ion4xe')"
    env:
-      AP_MODEL: edgecore_eap102
+      AP_MODEL: hfcl_ion4xe
    steps:
      - name: Set AP model output
        id: ap_model
@@ -1212,7 +1212,7 @@ jobs:
  report:
    if: "!cancelled()"
    runs-on: ubuntu-latest
-    needs: [vars, test-cig-wf186h, test-edgecore-eap104, test-cig-wf196, test-udaya-a6-id2, test-yuncore-ax820, test-edgecore-eap102, test-yuncore-fap655, test-cig-wf189, test-edgecore-eap105, test-sercomm-ap72tip, test-edgecore-eap101, test-edgecore-eap111]
+    needs: [vars, test-cig-wf186h, test-edgecore-eap104, test-cig-wf196, test-udaya-a6-id2, test-yuncore-ax820, test-hfcl-ion4xe, test-yuncore-fap655, test-cig-wf189, test-edgecore-eap105, test-sercomm-ap72tip, test-edgecore-eap101, test-edgecore-eap111]
    strategy:
      fail-fast: false
      matrix:
@@ -1263,7 +1263,7 @@ jobs:

  # Cleanup
  cleanup:
-    needs: [test-cig-wf186h, test-edgecore-eap104, test-cig-wf196, test-udaya-a6-id2, test-yuncore-ax820, test-edgecore-eap102, test-yuncore-fap655, test-cig-wf189, test-edgecore-eap105, test-sercomm-ap72tip, test-edgecore-eap101, test-edgecore-eap111]
+    needs: [test-cig-wf186h, test-edgecore-eap104, test-cig-wf196, test-udaya-a6-id2, test-yuncore-ax820, test-hfcl-ion4xe, test-yuncore-fap655, test-cig-wf189, test-edgecore-eap105, test-sercomm-ap72tip, test-edgecore-eap101, test-edgecore-eap111]
    runs-on: ubuntu-latest
    if: always()
    steps:
--- a/.github/workflows/regression.yml
+++ b/.github/workflows/regression.yml
@@ -22,7 +22,7 @@ on:
        description: "revision of the Open Wifi Helm chart"
      ap_models:
        required: true
-        default: "cig_wf186h,edgecore_eap104,cig_wf196,udaya_a6-id2,yuncore_ax820,edgecore_eap102,yuncore_fap655,cig_wf189,edgecore_eap105,sercomm_ap72tip,edgecore_eap101,edgecore_eap111"
+        default: "cig_wf186h,edgecore_eap104,cig_wf196,udaya_a6-id2,yuncore_ax820,hfcl_ion4xe,yuncore_fap655,cig_wf189,edgecore_eap105,sercomm_ap72tip,edgecore_eap101,edgecore_eap111"
        description: "the AP models to test"
      ap_version:
        required: true
@@ -129,13 +129,13 @@ jobs:

  # Run tests on APs

-  test-edgecore-eap102:
+  test-hfcl-ion4xe:
    needs: ["vars", "build", "test-yuncore-ax820"]
    runs-on: [self-hosted, small]
    timeout-minutes: 1440
-    if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'edgecore_eap102')"
+    if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'hfcl_ion4xe')"
    env:
-      AP_MODEL: edgecore_eap102
+      AP_MODEL: hfcl_ion4xe
    steps:
      - name: Set AP model output
        id: ap_model
@@ -1180,7 +1180,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'dfs_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-dfs
-          testbed: basic-4
+          testbed: basic-2
          marker_expression: "ow_regression_lf and dfs_tests"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -1206,7 +1206,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'multi_psk_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-multipsk
-          testbed: basic-4
+          testbed: basic-2
          marker_expression: "ow_regression_lf and multi_psk_tests"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -1232,7 +1232,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'rate_limiting_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-rate-limiting
-          testbed: basic-4
+          testbed: basic-2
          marker_expression: "ow_regression_lf and rate_limiting_tests"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -1258,7 +1258,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'rate_limiting_with_radius_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-rate-limiting-radius
-          testbed: basic-4
+          testbed: basic-2
          marker_expression: "ow_regression_lf and rate_limiting_with_radius_tests"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -1284,7 +1284,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'dynamic_vlan_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-dynamic-vlan
-          testbed: basic-4
+          testbed: basic-2
          marker_expression: "ow_regression_lf and dynamic_vlan_tests"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -1310,7 +1310,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'multi_vlan_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-multi-vlan
-          testbed: basic-4
+          testbed: basic-2
          marker_expression: "ow_regression_lf and multi_vlan_tests"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -1336,7 +1336,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'strict_forwarding_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-strict-forwarding
-          testbed: basic-4
+          testbed: basic-2
          marker_expression: "ow_regression_lf and strict_forwarding_tests"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -1362,7 +1362,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'advanced_captive_portal_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-captive-portal
-          testbed: basic-4
+          testbed: basic-2
          marker_expression: "ow_regression_lf and advanced_captive_portal_tests"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -1388,7 +1388,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'firmware_upgrade_downgrade')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-fwd
-          testbed: basic-4
+          testbed: basic-2
          marker_expression: "ow_regression_lf and firmware_upgrade_downgrade"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -1414,7 +1414,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'asb_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-asb
-          testbed: basic-4
+          testbed: basic-2
          marker_expression: "ow_regression_lf and asb_tests"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -1461,7 +1461,7 @@ jobs:


  test-cig-wf189:
-    needs: ["vars", "build", "test-yuncore-fap655"]
+    needs: ["vars", "build", "test-cig-wf196"]
    runs-on: [self-hosted, small]
    timeout-minutes: 1440
    if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'cig_wf189')"
@@ -2511,7 +2511,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'dfs_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-dfs
-          testbed: basic-2
+          testbed: basic-4
          marker_expression: "ow_regression_lf and dfs_tests"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -2536,7 +2536,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'multi_psk_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-multipsk
-          testbed: basic-2
+          testbed: basic-4
          marker_expression: "ow_regression_lf and multi_psk_tests"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -2561,7 +2561,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'rate_limiting_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-rate-limiting
-          testbed: basic-2
+          testbed: basic-4
          marker_expression: "ow_regression_lf and rate_limiting_tests"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -2586,7 +2586,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'rate_limiting_with_radius_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-rate-limiting-radius
-          testbed: basic-2
+          testbed: basic-4
          marker_expression: "ow_regression_lf and rate_limiting_with_radius_tests"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -2611,7 +2611,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'dynamic_vlan_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-dynamic-vlan
-          testbed: basic-2
+          testbed: basic-4
          marker_expression: "ow_regression_lf and dynamic_vlan_tests"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -2636,7 +2636,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'multi_vlan_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-multi-vlan
-          testbed: basic-2
+          testbed: basic-4
          marker_expression: "ow_regression_lf and multi_vlan_tests"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -2661,7 +2661,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'strict_forwarding_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-strict-forwarding
-          testbed: basic-2
+          testbed: basic-4
          marker_expression: "ow_regression_lf and strict_forwarding_tests"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -2687,7 +2687,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'advanced_captive_portal_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-captive-portal
-          testbed: basic-2
+          testbed: basic-4
          marker_expression: "ow_regression_lf and advanced_captive_portal_tests"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -2713,7 +2713,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'firmware_upgrade_downgrade')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-fwd
-          testbed: basic-2
+          testbed: basic-4
          marker_expression: "ow_regression_lf and firmware_upgrade_downgrade"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -2739,7 +2739,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'asb_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-asb
-          testbed: basic-2
+          testbed: basic-4
          marker_expression: "ow_regression_lf and asb_tests"
          configuration_file: "./lab_info.json"
          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
@@ -3117,7 +3117,7 @@ jobs:
        run: kubectl -n openwifi-qa01 logs deployment/owsec

  test-udaya-a6-id2:
-    needs: [ "vars", "build", "test-cig-wf196" ]
+    needs: [ "vars", "build", "test-yuncore-fap655" ]
    runs-on: [ self-hosted, small ]
    timeout-minutes: 1440
    if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'udaya_a6-id2')"
@@ -4117,7 +4117,7 @@ jobs:
  report:
    if: "!cancelled()"
    runs-on: ubuntu-latest
-    needs: [vars, test-cig-wf186h, test-edgecore-eap104, test-cig-wf196, test-udaya-a6-id2, test-yuncore-ax820, test-edgecore-eap102, test-yuncore-fap655, test-cig-wf189, test-edgecore-eap105, test-sercomm-ap72tip, test-edgecore-eap101, test-edgecore-eap111]
+    needs: [vars, test-cig-wf186h, test-edgecore-eap104, test-cig-wf196, test-udaya-a6-id2, test-yuncore-ax820, test-hfcl-ion4xe, test-yuncore-fap655, test-cig-wf189, test-edgecore-eap105, test-sercomm-ap72tip, test-edgecore-eap101, test-edgecore-eap111]
    strategy:
      fail-fast: false
      matrix:
@@ -4170,7 +4170,7 @@ jobs:

  # Cleanup
  cleanup:
-    needs: [test-cig-wf186h, test-edgecore-eap104, test-cig-wf196, test-udaya-a6-id2, test-yuncore-ax820, test-edgecore-eap102, test-yuncore-fap655, test-cig-wf189, test-edgecore-eap105, test-sercomm-ap72tip, test-edgecore-eap101, test-edgecore-eap111]
+    needs: [test-cig-wf186h, test-edgecore-eap104, test-cig-wf196, test-udaya-a6-id2, test-yuncore-ax820, test-hfcl-ion4xe, test-yuncore-fap655, test-cig-wf189, test-edgecore-eap105, test-sercomm-ap72tip, test-edgecore-eap101, test-edgecore-eap111]
    runs-on: ubuntu-latest
    if: always()
    steps: