Merge branch 'master' into WIFI-13177

Telecominfraproject · Dec 6, 2023 · 7b87712 · 7b87712
2 parents fdf503b + 1f97d12
commit 7b87712
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/.allure-overview/overviews.json b/.allure-overview/overviews.json
@@ -1,7 +1,7 @@
 {
     "sanity": {
         "OVERVIEW_TITLE": "'OpenWifi sanity results'",
-        "OVERVIEW_TESTBEDS": ["edgecore_oap101_6e","edgecore_eap101"]
+        "OVERVIEW_TESTBEDS": ["edgecore_oap101_6e","edgecore_eap101","cig_wf188n","cig_wf196","edgecore_eap102","edgecore_ecw5211","edgecore_ecw5410","edgecore_eap104","indio_um-305ac","hfcl_ion4xe"]
     },
     "interop": {
         "OVERVIEW_TITLE": "'OpenWifi interop results'",
@@ -15,6 +15,6 @@
 
     "performance": {
         "OVERVIEW_TITLE": "'OpenWifi performance results'",
-        "OVERVIEW_TESTBEDS": ["Wallys_DR6018","hfcl_ion4","hfcl_ion4xe","edgecore_ecw5211","edgecore_eap101","edgecore_eap102","liteon_wpx8324","cig_wf188n","indio_um-305ac","udaya_a5-id2"]
+        "OVERVIEW_TESTBEDS": ["edgecore_oap101_6e","edgecore_eap101","cig_wf188n","cig_wf196","edgecore_eap102","edgecore_ecw5211","edgecore_ecw5410","edgecore_eap104","indio_um-305ac","hfcl_ion4xe"]
     }
 }
diff --git 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_wf188n,cig_wf196,udaya_a5-id2,edgecore_ecw5211,indio_um-305ac,hfcl_ion4xe,edgecore_eap101"
+        default: "cig_wf188n,cig_wf196,hfcl_ion4xe,edgecore_ecw5211,indio_um-305ac,edgecore_oap101_6e,edgecore_eap102,edgecore_eap101,edgecore_eap104,edgecore_ecw5410"
         description: "the AP models to test"
       ap_version:
         required: true
@@ -76,10 +76,10 @@ jobs:
           echo "Current slot is $SLOT"
           if [[ "$SLOT" -eq "0" ]]; then
             echo "Choosing first slot since $SLOT == 0"
-            AP_MODELS="${{ github.event.inputs.ap_models || 'cig_wf188n, cig_wf196, udaya_a5-id2, edgecore_eap104, edgecore_eap101' }}"
+            AP_MODELS="${{ github.event.inputs.ap_models || 'cig_wf188n,cig_wf196,hfcl_ion4xe,edgecore_ecw5211,indio_um-305ac' }}"
           else
             echo "Choosing second slot since $SLOT != 0"
-            AP_MODELS="${{ github.event.inputs.ap_models || 'edgecore_ecw5211, indio_um-305ac, edgecore_oap101_6e, edgecore_eap102' }}"
+            AP_MODELS="${{ github.event.inputs.ap_models || 'edgecore_oap101_6e,edgecore_eap102,edgecore_eap101,edgecore_eap104,edgecore_ecw5410' }}"
           fi
           echo "List of AP models to test - $AP_MODELS"
           AP_MODELS=$(echo $AP_MODELS | sed "s/,/\",\"/g" | sed 's/^/[\"/g' | sed 's/$/\"]/g')
@@ -307,12 +307,12 @@ jobs:
         if: failure()
         run: kubectl -n openwifi-qa01 logs deployment/owsec
 
-  test-udaya-a5-id2:
+  test-edgecore-ecw5410:
     needs: [ "vars", "build" ]
     runs-on: ubuntu-latest
-    if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'udaya_a5-id2')"
+    if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'edgecore_ecw5410')"
     env:
-      AP_MODEL: udaya_a5-id2
+      AP_MODEL: edgecore_ecw5410
     steps:
       - name: Set AP model output
         id: ap_model
@@ -359,7 +359,7 @@ jobs:
         uses: ./.github/actions/run-tests
         with:
           namespace: ${{ steps.namespace.outputs.name }}
-          testbed: basic-3
+          testbed: basic-5a
           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 }}
@@ -404,6 +404,7 @@ jobs:
         if: failure()
         run: kubectl -n openwifi-qa01 logs deployment/owsec
 
+
   test-edgecore-ecw5211:
     needs: [ "vars", "build" ]
     runs-on: ubuntu-latest
@@ -650,7 +651,7 @@ jobs:
         uses: ./.github/actions/run-tests
         with:
           namespace: ${{ steps.namespace.outputs.name }}
-          testbed: advanced-1a
+          testbed: basic-4a
           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 }}
@@ -747,7 +748,7 @@ jobs:
         uses: ./.github/actions/run-tests
         with:
           namespace: ${{ steps.namespace.outputs.name }}
-          testbed: advanced-1b
+          testbed: basic-1a
           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 }}
@@ -844,7 +845,7 @@ jobs:
         uses: ./.github/actions/run-tests
         with:
           namespace: ${{ steps.namespace.outputs.name }}
-          testbed: advanced-1c
+          testbed: basic-3
           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 }}
@@ -943,7 +944,7 @@ jobs:
         uses: ./.github/actions/run-tests
         with:
           namespace: ${{ steps.namespace.outputs.name }}
-          testbed: advanced-2a
+          testbed: basic-3a
           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 }}
@@ -1041,7 +1042,7 @@ jobs:
         uses: ./.github/actions/run-tests
         with:
           namespace: ${{ steps.namespace.outputs.name }}
-          testbed: advanced-2c
+          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 }}
@@ -1092,7 +1093,7 @@ jobs:
   report:
     if: "!cancelled()"
     runs-on: ubuntu-latest
-    needs: [vars, test-cig-wf188n, test-cig-wf196, test-udaya-a5-id2, test-edgecore-ecw5211, test-indio-um-305ac, test-edgecore-eap104, test-edgecore-oap101-6e, test-hfcl-ion4xe, test-edgecore-eap101, test-edgecore-eap102]
+    needs: [vars, test-cig-wf188n, test-cig-wf196, test-edgecore-ecw5211, test-indio-um-305ac, test-edgecore-ecw5410, test-edgecore-eap104, test-edgecore-oap101-6e, test-hfcl-ion4xe, test-edgecore-eap101, test-edgecore-eap102]
     strategy:
       fail-fast: false
       matrix:
@@ -1143,7 +1144,7 @@ jobs:
 
   # Cleanup
   cleanup:
-    needs: [test-cig-wf188n, test-cig-wf196, test-udaya-a5-id2, test-edgecore-ecw5211, test-indio-um-305ac, test-edgecore-eap104, test-edgecore-oap101-6e, test-hfcl-ion4xe, test-edgecore-eap101, test-edgecore-eap102]
+    needs: [test-cig-wf188n, test-cig-wf196, test-edgecore-ecw5211, test-indio-um-305ac, test-edgecore-ecw5410, test-edgecore-eap104, test-edgecore-oap101-6e, test-hfcl-ion4xe, test-edgecore-eap101, test-edgecore-eap102]
     runs-on: ubuntu-latest
     if: always()
     steps:

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -54,7 +54,7 @@ def pytest_addoption(parser):
         "--testbed",
         # nargs="+",
         default="basic-testbed",
-        help="AP Model which is needed to test"
+        help="Testbed name for the AP Model which is needed to test"
     )
     parser.addoption(
         "--num_stations",

diff --git a/tests/controller_tests/ucentral_gateway/test_fms_service.py b/tests/controller_tests/ucentral_gateway/test_fms_service.py
@@ -147,6 +147,7 @@ def test_fms_system_configuration_items(self, get_target_object, get_testbed_det
 
 
 @pytest.mark.firmware_upgrade_downgrade
+@pytest.mark.ow_regression_lf
 @allure.parent_suite("Firmware Tests")
 @allure.suite("Firmware Upgrade/Downgrade Tests")
 class TestFirmwareUpgradeDowngrade(object):