From 5763156a6b7602b2d5c51f3d9b2da1bbbc0bb791 Mon Sep 17 00:00:00 2001 From: Sushant Bawiskar <72099364+SushantBawiskar@users.noreply.github.com> Date: Fri, 4 Mar 2022 12:58:23 +0530 Subject: [PATCH] Wifi 7227 (#416) * - adding 120 secs sleep to allow ap to broadcast all ssids Signed-off-by: Sushant Bawiskar * - replacing interop-01 and interop-04 (testbeds) between iphone 11 and iphone 12 Signed-off-by: Sushant Bawiskar * - replacing interop-01 and interop-04 (testbeds) between iphone 11 and iphone 12 Signed-off-by: Sushant Bawiskar --- .github/workflows/interop.yml | 24 ++++++++++++------------ tests/e2e/interOp/conftest.py | 3 +++ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/interop.yml b/.github/workflows/interop.yml index a2fa01918..8a9d74f6f 100644 --- a/.github/workflows/interop.yml +++ b/.github/workflows/interop.yml @@ -82,10 +82,10 @@ jobs: continue-on-error: true run: kubectl delete ns --ignore-not-found=true --wait interop-${{ github.run_id }}-galaxy-s9 - test-iphone-12: + test-iphone-11: runs-on: ubuntu-latest needs: [vars, test-galaxy-s9] - if: "!cancelled() && contains(fromJSON(needs.vars.outputs.devices), 'iphone-12')" + if: "!cancelled() && contains(fromJSON(needs.vars.outputs.devices), 'iphone-11')" steps: - uses: actions/checkout@v2 @@ -95,19 +95,19 @@ jobs: - name: run tests uses: ./.github/actions/run-tests with: - namespace: interop-${{ github.run_id }}-iphone-12 + namespace: interop-${{ github.run_id }}-iphone-11 testbed: interop-01 marker_expression: "${{ needs.vars.outputs.marker_overwrite || 'interop_uc_sanity and client_connect and ios' }}" configuration: "${{ secrets.LAB_CONFIGURATION_JSON }}" testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }} - additional_args: "-o model-iOS='iPhone-12' -o 'jobName=Github-Interop-iphone-12' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge" - allure_results_artifact_name: allure-results-iphone-12 + additional_args: "-o model-iOS='iPhone-11' -o 'jobName=Github-Interop-iphone-11' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge" + allure_results_artifact_name: allure-results-iphone-11 # necessary because if conditionals in composite actions are currently not respected - name: delete namespace if: always() continue-on-error: true - run: kubectl delete ns --ignore-not-found=true --wait interop-${{ github.run_id }}-iphone-12 + run: kubectl delete ns --ignore-not-found=true --wait interop-${{ github.run_id }}-iphone-11 # interop-02 test-galaxy-s10: @@ -247,10 +247,10 @@ jobs: continue-on-error: true run: kubectl delete ns --ignore-not-found=true --wait interop-${{ github.run_id }}-pixel-4 - test-iphone-11: + test-iphone-12: runs-on: ubuntu-latest needs: [vars, test-pixel-4] - if: "!cancelled() && contains(fromJSON(needs.vars.outputs.devices), 'iphone-11')" + if: "!cancelled() && contains(fromJSON(needs.vars.outputs.devices), 'iphone-12')" steps: - uses: actions/checkout@v2 @@ -260,19 +260,19 @@ jobs: - name: run tests uses: ./.github/actions/run-tests with: - namespace: interop-${{ github.run_id }}-iphone-11 + namespace: interop-${{ github.run_id }}-iphone-12 testbed: interop-04 marker_expression: "${{ needs.vars.outputs.marker_overwrite || 'interop_uc_sanity and client_connect and ios' }}" configuration: "${{ secrets.LAB_CONFIGURATION_JSON }}" testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }} - additional_args: "-o model-iOS='iPhone-11' -o 'jobName=Github-Interop-iphone-11' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge" - allure_results_artifact_name: allure-results-iphone-11 + additional_args: "-o model-iOS='iPhone-12' -o 'jobName=Github-Interop-iphone-12' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge" + allure_results_artifact_name: allure-results-iphone-12 # necessary because if conditionals in composite actions are currently not respected - name: delete namespace if: always() continue-on-error: true - run: kubectl delete ns --ignore-not-found=true --wait interop-${{ github.run_id }}-iphone-11 + run: kubectl delete ns --ignore-not-found=true --wait interop-${{ github.run_id }}-iphone-12 report: needs: [vars, test-iphone-11, test-iphone-xr, test-iphone-12, test-iphone-7] diff --git a/tests/e2e/interOp/conftest.py b/tests/e2e/interOp/conftest.py index c8dfa1d17..642d421b9 100644 --- a/tests/e2e/interOp/conftest.py +++ b/tests/e2e/interOp/conftest.py @@ -233,6 +233,9 @@ def setup_profiles(request, setup_controller, testbed, get_equipment_ref, fixtur get_markers, create_lanforge_chamberview_dut, lf_tools, get_security_flags, get_configuration, radius_info, get_apnos, radius_accounting_info, skip_lf=skip_lf, open_flow=get_openflow) + print("sleeping for 120 sec.") + time.sleep(120) + print("Done sleeping") yield return_var