Wifi 13063 (#862)

* removed udaya and replaced test-eap104 from advanced2 to basic4 Signed-off-by: anil-tegala <[email protected]> * removed ap's from advanced runs and moved to basic testbeds Signed-off-by: anil-tegala <[email protected]> * test-udaya replaced with test-edgecore-ecw5410 & slot's updated with new ap's Signed-off-by: anil-tegala <[email protected]> * added ecw5410 to allure overviews page Signed-off-by: anil-tegala <[email protected]> --------- Signed-off-by: anil-tegala <[email protected]>
Telecominfraproject · Nov 27, 2023 · 94ca712 · 94ca712
1 parent 6528c28
commit 94ca712
Show file tree

Hide file tree

Showing 2 changed files with 104 additions and 103 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","cig_wf188n","cig_wf196","edgecore_eap102","edgecore_ecw5211","edgecore_eap104","indio_um-305ac","hfcl_ion4xe"]
+        "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": ["edgecore_oap101_6e","edgecore_eap101","cig_wf188n","cig_wf196","edgecore_eap102","edgecore_ecw5211","edgecore_eap104","indio_um-305ac","hfcl_ion4xe"]
+        "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,edgecore_ecw5211,indio_um-305ac,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, edgecore_eap101, edgecore_ecw5211, indio_um-305ac' }}"
+            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_oap101_6e, edgecore_eap102, edgecore_eap101, edgecore_eap104, indio_um-305ac' }}"
+            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,102 +307,103 @@ jobs:
         if: failure()
         run: kubectl -n openwifi-qa01 logs deployment/owsec
 
-#  test-udaya-a5-id2:
-#    needs: [ "vars", "build" ]
-#    runs-on: ubuntu-latest
-#    if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'udaya_a5-id2')"
-#    env:
-#      AP_MODEL: udaya_a5-id2
-#    steps:
-#      - name: Set AP model output
-#        id: ap_model
-#        run: |
-#          echo "model=${AP_MODEL}" >> $GITHUB_OUTPUT
-#
-#      - uses: actions/checkout@v3
-#      - name: Set up Python
-#        uses: actions/setup-python@v4
-#        with:
-#          python-version: "3.8"
-#
-#      # TODO WIFI-7839 delete when issue is resolved on AWS CLI side
-#      - name: install kubectl
-#        run: |
-#          curl -s -LO "https://dl.k8s.io/release/v1.27.6/bin/linux/amd64/kubectl"
-#          sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
-#
-#      - name: get EKS access credentials
-#        run: aws eks update-kubeconfig --name ${{ env.AWS_EKS_NAME }}
-#
-#      - name: prepare namespace name
-#        id: namespace
-#        run: |
-#          NAMESPACE="testing-${{ github.run_id }}-$(echo ${{ steps.ap_model.outputs.model }} | tr '[:upper:]' '[:lower:]' | tr '_' '-')"
-#          echo "name=${NAMESPACE}" >> $GITHUB_OUTPUT
-#
-#      - name: prepare configuration
-#        run: |
-#          cat << EOF > lab_info.json
-#          ${{ secrets.LAB_INFO_JSON }}
-#          EOF
-#
-#      #          DYN_CONFIG="$(python .quali/get_configuration.py --json ${{ steps.reservation.outputs.identifier }})"
-#      #          jq ".CONFIGURATION.basic=$DYN_CONFIG" lab_info.json > lab_info.json.tmp && mv lab_info.json.tmp lab_info.json
-#      #
-#      #          # overwrite configuration value from Quali
-#      #          if [ ${{ needs.vars.outputs.existing_controller }} != '' ]
-#      #          then
-#      #            jq '.CONFIGURATION.basic.controller.url="https://sec-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build:16001"' lab_info.json > lab_info.json.tmp && mv lab_info.json.tmp lab_info.json
-#      #          fi
-#
-#      - name: run tests
-#        uses: ./.github/actions/run-tests
-#        with:
-#          namespace: ${{ steps.namespace.outputs.name }}
-#          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 }}
-#          additional_args: '-o firmware="${{ needs.vars.outputs.ap_version }}"'
-#          allure_results_artifact_name: "allure-results-${{ steps.ap_model.outputs.model }}"
-#          dns_records_to_resolve: "sec-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build gw-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build fms-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build"
-#
-#      # necessary because if conditionals in composite actions are currently not respected
-#      - name: get tests logs
-#        if: always()
-#        continue-on-error: true
-#        run: |
-#          podname=$(kubectl get pods -n ${{ steps.namespace.outputs.name }} --no-headers -o custom-columns=":metadata.name" -l job-name=testing | sed "s/pod\///")
-#          kubectl logs --timestamps -n ${{ steps.namespace.outputs.name }} $podname || true
-#
-#      - name: delete namespace
-#        if: always()
-#        continue-on-error: true
-#        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}
-#
-#      - name: show gw logs
-#        if: failure()
-#        run: kubectl -n openwifi-qa01 logs deployment/owgw
-#
-#      - name: show fms logs
-#        if: failure()
-#        run: kubectl -n openwifi-qa01 logs deployment/owfms
-#
-#      - name: show prov logs
-#        if: failure()
-#        run: kubectl -n openwifi-qa01 logs deployment/owprov
-#
-#      - name: show analytics logs
-#        if: failure()
-#        run: kubectl -n openwifi-qa01 logs deployment/owanalytics
-#
-#      - name: show subscription (userportal) logs
-#        if: failure()
-#        run: kubectl -n openwifi-qa01 logs deployment/owsub
-#
-#      - name: show sec logs
-#        if: failure()
-#        run: kubectl -n openwifi-qa01 logs deployment/owsec
+  test-edgecore-ecw5410:
+    needs: [ "vars", "build" ]
+    runs-on: ubuntu-latest
+    if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'edgecore_ecw5410')"
+    env:
+      AP_MODEL: edgecore_ecw5410
+    steps:
+      - name: Set AP model output
+        id: ap_model
+        run: |
+          echo "model=${AP_MODEL}" >> $GITHUB_OUTPUT
+
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.8"
+
+      # TODO WIFI-7839 delete when issue is resolved on AWS CLI side
+      - name: install kubectl
+        run: |
+          curl -s -LO "https://dl.k8s.io/release/v1.27.6/bin/linux/amd64/kubectl"
+          sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
+
+      - name: get EKS access credentials
+        run: aws eks update-kubeconfig --name ${{ env.AWS_EKS_NAME }}
+
+      - name: prepare namespace name
+        id: namespace
+        run: |
+          NAMESPACE="testing-${{ github.run_id }}-$(echo ${{ steps.ap_model.outputs.model }} | tr '[:upper:]' '[:lower:]' | tr '_' '-')"
+          echo "name=${NAMESPACE}" >> $GITHUB_OUTPUT
+
+      - name: prepare configuration
+        run: |
+          cat << EOF > lab_info.json
+          ${{ secrets.LAB_INFO_JSON }}
+          EOF
+
+      #          DYN_CONFIG="$(python .quali/get_configuration.py --json ${{ steps.reservation.outputs.identifier }})"
+      #          jq ".CONFIGURATION.basic=$DYN_CONFIG" lab_info.json > lab_info.json.tmp && mv lab_info.json.tmp lab_info.json
+      #
+      #          # overwrite configuration value from Quali
+      #          if [ ${{ needs.vars.outputs.existing_controller }} != '' ]
+      #          then
+      #            jq '.CONFIGURATION.basic.controller.url="https://sec-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build:16001"' lab_info.json > lab_info.json.tmp && mv lab_info.json.tmp lab_info.json
+      #          fi
+
+      - name: run tests
+        uses: ./.github/actions/run-tests
+        with:
+          namespace: ${{ steps.namespace.outputs.name }}
+          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 }}
+          additional_args: '-o firmware="${{ needs.vars.outputs.ap_version }}"'
+          allure_results_artifact_name: "allure-results-${{ steps.ap_model.outputs.model }}"
+          dns_records_to_resolve: "sec-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build gw-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build fms-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build"
+
+      # necessary because if conditionals in composite actions are currently not respected
+      - name: get tests logs
+        if: always()
+        continue-on-error: true
+        run: |
+          podname=$(kubectl get pods -n ${{ steps.namespace.outputs.name }} --no-headers -o custom-columns=":metadata.name" -l job-name=testing | sed "s/pod\///")
+          kubectl logs --timestamps -n ${{ steps.namespace.outputs.name }} $podname || true
+
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}
+
+      - name: show gw logs
+        if: failure()
+        run: kubectl -n openwifi-qa01 logs deployment/owgw
+
+      - name: show fms logs
+        if: failure()
+        run: kubectl -n openwifi-qa01 logs deployment/owfms
+
+      - name: show prov logs
+        if: failure()
+        run: kubectl -n openwifi-qa01 logs deployment/owprov
+
+      - name: show analytics logs
+        if: failure()
+        run: kubectl -n openwifi-qa01 logs deployment/owanalytics
+
+      - name: show subscription (userportal) logs
+        if: failure()
+        run: kubectl -n openwifi-qa01 logs deployment/owsub
+
+      - name: show sec logs
+        if: failure()
+        run: kubectl -n openwifi-qa01 logs deployment/owsec
+
 
   test-edgecore-ecw5211:
     needs: [ "vars", "build" ]
@@ -1092,7 +1093,7 @@ jobs:
   report:
     if: "!cancelled()"
     runs-on: ubuntu-latest
-    needs: [vars, test-cig-wf188n, test-cig-wf196, 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-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: