From c0c3387ac25042d0dc475188233b5548bfe81bb3 Mon Sep 17 00:00:00 2001 From: Jitendrakumar Kushavah <78074038+jitendracandela@users.noreply.github.com> Date: Wed, 4 Sep 2024 10:21:01 +0530 Subject: [PATCH] =?UTF-8?q?Replaced=20cig=5Fwf186w=20with=20cig=5Fwf186h?= =?UTF-8?q?=20as=20per=203.2=20Target=20in=20the=20sanity,r=E2=80=A6=20(#9?= =?UTF-8?q?89)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Replaced cig_wf186w with cig_wf186h as per 3.2 Target in the sanity,regression,performance workflows Signed-off-by: jitendracandela * Added pass fail criteria for cig_wf186h Signed-off-by: jitendracandela --------- Signed-off-by: jitendracandela --- .github/workflows/performance.yml | 18 +++++++-------- .github/workflows/quali.yml | 16 +++++++------- .github/workflows/regression.yml | 18 +++++++-------- .../performance_pass_fail.json | 22 +++++++++++++++++++ 4 files changed, 48 insertions(+), 26 deletions(-) diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml index 154ab94e73..697b8a4e2e 100644 --- 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_wf186w,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,edgecore_eap102,yuncore_fap655,cig_wf189,edgecore_eap105,sercomm_ap72tip,edgecore_eap101,edgecore_eap111" description: "the AP models to test" ap_version: required: true @@ -95,9 +95,9 @@ jobs: elif [[ "$DOW" -eq "3" ]]; then AP_MODELS="${{ github.event.inputs.ap_models || 'yuncore_fap655,sercomm_ap72tip,edgecore_eap101' }}" elif [[ "$DOW" -eq "4" ]]; then - AP_MODELS="${{ github.event.inputs.ap_models || 'cig_wf186w,cig_wf196,yuncore_ax820' }}" + AP_MODELS="${{ github.event.inputs.ap_models || 'cig_wf186h,cig_wf196,yuncore_ax820' }}" else - AP_MODELS="${{ github.event.inputs.ap_models || 'cig_wf186w,cig_wf196,yuncore_ax820,yuncore_fap655,sercomm_ap72tip,edgecore_eap101' }}" + AP_MODELS="${{ github.event.inputs.ap_models || 'cig_wf186h,cig_wf196,yuncore_ax820,yuncore_fap655,sercomm_ap72tip,edgecore_eap101' }}" fi echo "List of AP models to test - $AP_MODELS" AP_MODELS=$(echo $AP_MODELS | sed "s/,/\",\"/g" | sed 's/^/[\"/g' | sed 's/$/\"]/g') @@ -536,13 +536,13 @@ jobs: run: kubectl -n openwifi-${{ needs.vars.outputs.existing_controller }} logs deployment/owsec - test-cig-wf186w: + test-cig-wf186h: needs: [ "vars", "build"] runs-on: [ self-hosted, small ] timeout-minutes: 1440 - if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'cig_wf186w')" + if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'cig_wf186h')" env: - AP_MODEL: cig_wf186w + AP_MODEL: cig_wf186h steps: - name: Set AP model output id: ap_model @@ -1146,7 +1146,7 @@ jobs: test-edgecore-eap104: - needs: ["vars", "build", "test-cig-wf186w" ] + needs: ["vars", "build", "test-cig-wf186h" ] runs-on: [ self-hosted, small ] timeout-minutes: 1440 if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'edgecore_eap104')" @@ -2573,7 +2573,7 @@ jobs: report: if: "!cancelled()" runs-on: ubuntu-latest - needs: [vars, test-cig-wf186w, 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-edgecore-eap102, 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-wf186w, 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-edgecore-eap102, 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: diff --git a/.github/workflows/quali.yml b/.github/workflows/quali.yml index 6d59f6a590..26eaebfa8b 100644 --- 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_wf186w,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,edgecore_eap102,yuncore_fap655,cig_wf189,edgecore_eap105,sercomm_ap72tip,edgecore_eap101,edgecore_eap111" description: "the AP models to test" ap_version: required: true @@ -91,7 +91,7 @@ jobs: if [[ "$SLOT" -eq "1" ]]; then echo "Choosing first slot (5 PM IST)" if [[ "$DOW" -eq "1" || "$DOW" -eq "3" ]]; then - AP_MODELS="${{ github.event.inputs.ap_models || 'cig_wf186w,cig_wf196,yuncore_ax820' }}" + AP_MODELS="${{ github.event.inputs.ap_models || 'cig_wf186h,cig_wf196,yuncore_ax820' }}" else AP_MODELS="${{ github.event.inputs.ap_models || 'yuncore_fap655,sercomm_ap72tip,edgecore_eap101' }}" fi @@ -103,7 +103,7 @@ jobs: AP_MODELS="${{ github.event.inputs.ap_models || 'cig_wf189,edgecore_eap105,edgecore_eap111' }}" fi else - AP_MODELS="${{ github.event.inputs.ap_models || 'cig_wf186w,cig_wf196,yuncore_ax820,yuncore_fap655,sercomm_ap72tip,edgecore_eap101' }}" + AP_MODELS="${{ github.event.inputs.ap_models || 'cig_wf186h,cig_wf196,yuncore_ax820,yuncore_fap655,sercomm_ap72tip,edgecore_eap101' }}" fi echo "List of AP models to test - $AP_MODELS" @@ -672,12 +672,12 @@ jobs: if: failure() run: kubectl -n openwifi-qa01 logs deployment/owsec - test-cig-wf186w: + test-cig-wf186h: needs: [ "vars", "build" ] runs-on: ubuntu-latest - if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'cig_wf186w')" + if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'cig_wf186h')" env: - AP_MODEL: cig_wf186w + AP_MODEL: cig_wf186h 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-wf186w, 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-edgecore-eap102, 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-wf186w, 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-edgecore-eap102, 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: diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index bf9fa900b6..09db82bba7 100644 --- 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_wf186w,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,edgecore_eap102,yuncore_fap655,cig_wf189,edgecore_eap105,sercomm_ap72tip,edgecore_eap101,edgecore_eap111" description: "the AP models to test" ap_version: required: true @@ -90,13 +90,13 @@ jobs: # choose AP models as per the day if the scheduled run gets triggered else input provided. if [[ "$DOW" -eq "5" ]]; then - AP_MODELS="${{ github.event.inputs.ap_models || 'cig_wf186w,cig_wf196,cig_wf189,edgecore_eap105' }}" + AP_MODELS="${{ github.event.inputs.ap_models || 'cig_wf186h,cig_wf196,cig_wf189,edgecore_eap105' }}" elif [[ "$DOW" -eq "6" ]]; then AP_MODELS="${{ github.event.inputs.ap_models || 'edgecore_eap104,yuncore_ax820,sercomm_ap72tip,edgecore_eap111' }}" elif [[ "$DOW" -eq "7" ]]; then AP_MODELS="${{ github.event.inputs.ap_models || 'udaya_a6-id2,edgecore_eap102,yuncore_fap655,edgecore_eap101' }}" else - AP_MODELS="${{ github.event.inputs.ap_models || 'cig_wf186w,cig_wf196,yuncore_ax820,yuncore_fap655,sercomm_ap72tip,edgecore_eap101' }}" + AP_MODELS="${{ github.event.inputs.ap_models || 'cig_wf186h,cig_wf196,yuncore_ax820,yuncore_fap655,sercomm_ap72tip,edgecore_eap101' }}" fi AP_MODELS=$(echo $AP_MODELS | sed "s/,/\",\"/g" | sed 's/^/[\"/g' | sed 's/$/\"]/g') @@ -461,13 +461,13 @@ jobs: if: failure() run: kubectl -n openwifi-qa01 logs deployment/owsec - test-cig-wf186w: + test-cig-wf186h: needs: [ "vars", "build"] runs-on: [ self-hosted, small ] timeout-minutes: 1440 - if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'cig_wf186w')" + if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'cig_wf186h')" env: - AP_MODEL: cig_wf186w + AP_MODEL: cig_wf186h steps: - name: Set AP model output id: ap_model @@ -1793,7 +1793,7 @@ jobs: run: kubectl -n openwifi-qa01 logs deployment/owsec test-edgecore-eap104: - needs: ["vars", "build", "test-cig-wf186w"] + needs: ["vars", "build", "test-cig-wf186h"] runs-on: [self-hosted, small] timeout-minutes: 1440 if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'edgecore_eap104')" @@ -4117,7 +4117,7 @@ jobs: report: if: "!cancelled()" runs-on: ubuntu-latest - needs: [vars, test-cig-wf186w, 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-edgecore-eap102, 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-wf186w, 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-edgecore-eap102, 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: diff --git a/tests/e2e/basic/performance_tests/performance_pass_fail.json b/tests/e2e/basic/performance_tests/performance_pass_fail.json index cd6af581f7..38dac3ca9a 100644 --- a/tests/e2e/basic/performance_tests/performance_pass_fail.json +++ b/tests/e2e/basic/performance_tests/performance_pass_fail.json @@ -170,6 +170,28 @@ "UDP": 1800 } }, + "cig_wf186h":{ + "2G 2x2 20MHz": { + "TCP": 200, + "UDP": 220 + }, + "2G 4x4 20MHz": { + "TCP": null, + "UDP": null + }, + "5G 2x2 80MHz": { + "TCP": 800, + "UDP": 900 + }, + "5G 4x4 80MHz": { + "TCP": null, + "UDP": null + }, + "5G 2x2 160MHz": { + "TCP": 1600, + "UDP": 1800 + } + }, "hfcl_ion4xe":{ "2G 2x2 20MHz": { "TCP": 200,