fix pull.yml after rebase

Author: cccclai

.github/workflows/pull.yml

@@ -14,29 +14,24 @@ concurrency:
 
 jobs:
   test-qnn-wheel-packages-linux:
-    name: test-qnn-wheel-packages-linux (py${{ matrix.python-version }})
+    name: test-qnn-wheel-packages-linux
     uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
     permissions:
       id-token: write
       contents: read
     strategy:
       fail-fast: false
-      matrix:
-        python-version: [ "3.10", "3.11", "3.12" ]
     with:
       runner: linux.2xlarge
-      docker-image: ci-image:executorch-ubuntu-22.04-clang12
+      docker-image: ci-image:executorch-ubuntu-22.04-qnn-sdk
       submodules: 'recursive'
       ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       timeout: 180
       script: |
+        # The generic Linux job chooses to use base env, not the one setup by the image
         CONDA_ENV=$(conda env list --json | jq -r ".envs | .[-1]")
         conda activate "${CONDA_ENV}"
 
-        # Create a clean env for each python version
-        conda create -y -n test_env_${{ matrix.python-version }} python=${{ matrix.python-version }}
-        conda activate test_env_${{ matrix.python-version }}
-
         PYTHON_EXECUTABLE=python bash .ci/scripts/test_wheel_package_qnn.sh
 
   # test-setup-linux-gcc:
@@ -237,29 +232,29 @@ jobs:
   #       PYTHON_EXECUTABLE=python \
   #       bash .ci/scripts/build_llama_android.sh  "${BUILD_TOOL}"
 
-  # test-custom-ops-linux:
-  #   name: test-custom-ops-linux
-  #   uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
-  #   permissions:
-  #     id-token: write
-  #     contents: read
-  #   strategy:
-  #     fail-fast: false
-  #   with:
-  #     runner: linux.2xlarge
-  #     docker-image: ci-image:executorch-ubuntu-22.04-clang12
-  #     submodules: 'recursive'
-  #     ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
-  #     timeout: 90
-  #     script: |
-  #       # The generic Linux job chooses to use base env, not the one setup by the image
-  #       CONDA_ENV=$(conda env list --json | jq -r ".envs | .[-1]")
-  #       conda activate "${CONDA_ENV}"
+  test-custom-ops-linux:
+    name: test-custom-ops-linux
+    uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
+    permissions:
+      id-token: write
+      contents: read
+    strategy:
+      fail-fast: false
+    with:
+      runner: linux.2xlarge
+      docker-image: ci-image:executorch-ubuntu-22.04-clang12
+      submodules: 'recursive'
+      ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+      timeout: 90
+      script: |
+        # The generic Linux job chooses to use base env, not the one setup by the image
+        CONDA_ENV=$(conda env list --json | jq -r ".envs | .[-1]")
+        conda activate "${CONDA_ENV}"
 
-  #       BUILD_TOOL="cmake"
-  #       PYTHON_EXECUTABLE=python bash .ci/scripts/setup-linux.sh --build-tool "${BUILD_TOOL}"
-  #       # Test custom ops
-  #       PYTHON_EXECUTABLE=python bash examples/portable/custom_ops/test_custom_ops.sh "${BUILD_TOOL}"
+        BUILD_TOOL="cmake"
+        PYTHON_EXECUTABLE=python bash .ci/scripts/setup-linux.sh --build-tool "${BUILD_TOOL}"
+        # Test custom ops
+        PYTHON_EXECUTABLE=python bash examples/portable/custom_ops/test_custom_ops.sh "${BUILD_TOOL}"
 
   # test-selective-build-linux:
   #   name: test-selective-build-linux