Added sonicfi_rap630c-311g AP in the sanity, regression and performance workflows (#1022)

Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com>
2025-10-29 18:12:34 +00:00 · 2025-01-31 10:35:48 +05:30
parent 3071f15f55
commit 6d72c1a16b
3 changed files with 40 additions and 40 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,hfcl_ion4xe,yuncore_fap655,cig_wf189,edgecore_eap105,sercomm_ap72tip,edgecore_eap101,edgecore_eap111"
+        default: "cig_wf186h,edgecore_eap104,cig_wf196,udaya_a6-id2,sonicfi_rap630c-311g,hfcl_ion4xe,yuncore_fap655,cig_wf189,edgecore_eap105,sercomm_ap72tip,edgecore_eap101,edgecore_eap111"
        description: "the AP models to test"
      ap_version:
        required: true
@@ -334,7 +334,7 @@ jobs:


  test-hfcl-ion4xe:
-    needs: ["vars", "build", "test-yuncore-ax820" ]
+    needs: ["vars", "build", "test-udaya-a6-id2" ]
    runs-on: [ self-hosted, small ]
    timeout-minutes: 1440
    if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'hfcl_ion4xe')"
@@ -1348,13 +1348,13 @@ jobs:
        run: kubectl -n openwifi-${{ needs.vars.outputs.existing_controller }} logs deployment/owsec


-  test-yuncore-ax820:
-    needs: ["vars", "build"]
+  test-sonicfi-rap630c-311g:
+    needs: ["vars", "build", "test-yuncore-fap655" ]
    runs-on: [ self-hosted, small ]
    timeout-minutes: 1440
-    if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'yuncore_ax820')"
+    if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'sonicfi_rap630c-311g')"
    env:
-      AP_MODEL: yuncore_ax820
+      AP_MODEL: sonicfi_rap630c-311g
    steps:
      - name: Set AP model output
        id: ap_model
@@ -1403,7 +1403,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'dataplane_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-dtt
-          testbed: basic-3
+          testbed: basic-2a
          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 }}
@@ -1429,7 +1429,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'wifi_capacity_ax_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-wca
-          testbed: basic-3
+          testbed: basic-2a
          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 }}
@@ -1455,7 +1455,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'peak_throughput_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-ssdbt
-          testbed: basic-3
+          testbed: basic-2a
          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 }}
@@ -1481,7 +1481,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'client_scale_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-wct
-          testbed: basic-3
+          testbed: basic-2a
          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 }}
@@ -1507,7 +1507,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'dual_band_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-wct
-          testbed: basic-3
+          testbed: basic-2a
          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-yuncore-fap655" ]
+    needs: [ "vars", "build"]
    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-hfcl-ion4xe, 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-sonicfi-rap630c-311g, 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-hfcl-ion4xe, 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-sonicfi-rap630c-311g, 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,hfcl_ion4xe,yuncore_fap655,cig_wf189,edgecore_eap105,sercomm_ap72tip,edgecore_eap101,edgecore_eap111"
+        default: "cig_wf186h,edgecore_eap104,cig_wf196,udaya_a6-id2,sonicfi_rap630c-311g,hfcl_ion4xe,yuncore_fap655,cig_wf189,edgecore_eap105,sercomm_ap72tip,edgecore_eap101,edgecore_eap111"
        description: "the AP models to test"
      ap_version:
        required: true
@@ -405,12 +405,12 @@ jobs:
        if: failure()
        run: kubectl -n openwifi-qa01 logs deployment/owsec

-  test-yuncore-ax820:
+  test-sonicfi-rap630c-311g:
    needs: [ "vars", "build" ]
    runs-on: ubuntu-latest
-    if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'yuncore_ax820')"
+    if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'sonicfi_rap630c-311g')"
    env:
-      AP_MODEL: yuncore_ax820
+      AP_MODEL: sonicfi_rap630c-311g
    steps:
      - name: Set AP model output
        id: ap_model
@@ -449,7 +449,7 @@ jobs:
        uses: ./.github/actions/run-tests
        with:
          namespace: ${{ steps.namespace.outputs.name }}
-          testbed: basic-3
+          testbed: basic-2a
          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 }}
@@ -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-hfcl-ion4xe, 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-sonicfi-rap630c-311g, 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-hfcl-ion4xe, 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-sonicfi-rap630c-311g, 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,hfcl_ion4xe,yuncore_fap655,cig_wf189,edgecore_eap105,sercomm_ap72tip,edgecore_eap101,edgecore_eap111"
+        default: "cig_wf186h,edgecore_eap104,cig_wf196,udaya_a6-id2,sonicfi_rap630c-311g,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-hfcl-ion4xe:
-    needs: ["vars", "build", "test-yuncore-ax820"]
+    needs: ["vars", "build", "test-udaya-a6-id2" ]
    runs-on: [self-hosted, small]
    timeout-minutes: 1440
    if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'hfcl_ion4xe')"
@@ -2125,13 +2125,13 @@ jobs:
        run: kubectl -n openwifi-qa01 logs deployment/owsec


-  test-yuncore-ax820:
-    needs: ["vars", "build"]
+  test-sonicfi-rap630c-311g:
+    needs: ["vars", "build", "test-yuncore-fap655" ]
    runs-on: [self-hosted, small]
    timeout-minutes: 1440
-    if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'yuncore_ax820')"
+    if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'sonicfi_rap630c-311g')"
    env:
-      AP_MODEL: yuncore_ax820
+      AP_MODEL: sonicfi_rap630c-311g
    steps:
      - name: Set AP model output
        id: ap_model
@@ -2178,7 +2178,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'dfs_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-dfs
-          testbed: basic-3
+          testbed: basic-2a
          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 }}
@@ -2204,7 +2204,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'multi_psk_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-multipsk
-          testbed: basic-3
+          testbed: basic-2a
          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 }}
@@ -2230,7 +2230,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'rate_limiting_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-rate-limiting
-          testbed: basic-3
+          testbed: basic-2a
          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 }}
@@ -2256,7 +2256,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-3
+          testbed: basic-2a
          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 }}
@@ -2282,7 +2282,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'dynamic_vlan_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-dynamic-vlan
-          testbed: basic-3
+          testbed: basic-2a
          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 }}
@@ -2308,7 +2308,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'multi_vlan_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-multi-vlan
-          testbed: basic-3
+          testbed: basic-2a
          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 }}
@@ -2334,7 +2334,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'strict_forwarding_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-strict-forwarding
-          testbed: basic-3
+          testbed: basic-2a
          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 }}
@@ -2360,7 +2360,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-3
+          testbed: basic-2a
          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 }}
@@ -2386,7 +2386,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'firmware_upgrade_downgrade')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-fwd
-          testbed: basic-3
+          testbed: basic-2a
          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 }}
@@ -2412,7 +2412,7 @@ jobs:
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'asb_tests')"
        with:
          namespace: ${{ steps.namespace.outputs.name }}-asb
-          testbed: basic-3
+          testbed: basic-2a
          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-yuncore-fap655" ]
+    needs: [ "vars", "build" ]
    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-hfcl-ion4xe, 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-sonicfi-rap630c-311g, 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-hfcl-ion4xe, 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-sonicfi-rap630c-311g, 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: