Adjusted interop workflow to add one more AP

Signed-off-by: haricharan-jaka <haricharan.jaka@candelatech.com>
Signed-off-by: Max Brenner <xamrennerb@gmail.com>

.github/workflows/interop.yml

@@ -101,27 +101,6 @@ jobs:
           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
 
-  test-pixel-4:
-    runs-on: ubuntu-latest
-    needs: [vars, test-iphone-12]
-    if: "!cancelled() && contains(fromJSON(needs.vars.outputs.devices), 'pixel-4')"
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: get EKS access credentials
-        run: aws eks update-kubeconfig  --name ${{ env.AWS_EKS_NAME }}
-
-      - name: run tests
-        uses: ./.github/actions/run-tests
-        with:
-          namespace: interop-${{ github.run_id }}-pixel-4
-          testbed: interop-01
-          marker_expression: "${{ needs.vars.outputs.marker_overwrite || 'interop_uc_sanity and client_connect and android' }}"
-          configuration: "${{ secrets.LAB_CONFIGURATION }}"
-          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
-          additional_args: "-o model-android='Pixel 4' -o 'jobName=Github-Interop-pixel-4' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge"
-          allure_results_artifact_name: allure-results-pixel-4
-
   # interop-02
   test-galaxy-s10:
     runs-on: ubuntu-latest
@@ -165,27 +144,6 @@ jobs:
           additional_args: "-o model-iOS='iPhone-7' -o 'jobName=Github-Interop-iphone-7' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge"
           allure_results_artifact_name: allure-results-iphone-7
 
-  test-iphone-11:
-    runs-on: ubuntu-latest
-    needs: [vars, test-iphone-7]
-    if: "!cancelled() && contains(fromJSON(needs.vars.outputs.devices), 'iphone-11')"
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: get EKS access credentials
-        run: aws eks update-kubeconfig  --name ${{ env.AWS_EKS_NAME }}
-
-      - name: run tests
-        uses: ./.github/actions/run-tests
-        with:
-          namespace: interop-${{ github.run_id }}-iphone-11
-          testbed: interop-02
-          marker_expression: "${{ needs.vars.outputs.marker_overwrite || 'interop_uc_sanity and client_connect and ios' }}"
-          configuration: "${{ secrets.LAB_CONFIGURATION }}"
-          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
-
   # interop-03
   test-galaxy-s20:
     runs-on: ubuntu-latest
@@ -229,8 +187,51 @@ jobs:
           additional_args: "-o model-iOS='iPhone-XR' -o 'jobName=Github-Interop-iphone-xr' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge"
           allure_results_artifact_name: allure-results-iphone-xr
 
+  #interop-04
+  test-pixel-4:
+    runs-on: ubuntu-latest
+    needs: [vars, build]
+    if: "!cancelled() && contains(fromJSON(needs.vars.outputs.devices), 'pixel-4')"
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: get EKS access credentials
+        run: aws eks update-kubeconfig  --name ${{ env.AWS_EKS_NAME }}
+
+      - name: run tests
+        uses: ./.github/actions/run-tests
+        with:
+          namespace: interop-${{ github.run_id }}-pixel-4
+          testbed: interop-04
+          marker_expression: "${{ needs.vars.outputs.marker_overwrite || 'interop_uc_sanity and client_connect and android' }}"
+          configuration: "${{ secrets.LAB_CONFIGURATION }}"
+          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
+          additional_args: "-o model-android='Pixel 4' -o 'jobName=Github-Interop-pixel-4' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge"
+          allure_results_artifact_name: allure-results-pixel-4
+
+  test-iphone-11:
+    runs-on: ubuntu-latest
+    needs: [vars, test-pixel-4]
+    if: "!cancelled() && contains(fromJSON(needs.vars.outputs.devices), 'iphone-11')"
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: get EKS access credentials
+        run: aws eks update-kubeconfig  --name ${{ env.AWS_EKS_NAME }}
+
+      - name: run tests
+        uses: ./.github/actions/run-tests
+        with:
+          namespace: interop-${{ github.run_id }}-iphone-11
+          testbed: interop-04
+          marker_expression: "${{ needs.vars.outputs.marker_overwrite || 'interop_uc_sanity and client_connect and ios' }}"
+          configuration: "${{ secrets.LAB_CONFIGURATION }}"
+          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
+
   report:
-    needs: [vars, test-iphone-11, test-iphone-xr, test-pixel-4]
+    needs: [vars, test-iphone-11, test-iphone-xr, test-iphone-12, test-iphone-7]
     if: "!cancelled()"
     runs-on: ubuntu-latest
     strategy:
@@ -282,7 +283,7 @@ jobs:
           s3_access_key_secret: ${{ secrets.ALLURE_S3_ACCESS_KEY_SECRET }}
 
   cleanup:
-    needs: [test-iphone-11, test-iphone-xr, test-pixel-4]
+    needs: [test-iphone-11, test-iphone-xr, test-iphone-12, test-iphone-7]
     runs-on: ubuntu-latest
     if: always()
     steps: