Skip to content

Commit 037cfcf

Browse files
guangy10facebook-github-bot
authored andcommitted
Disable uploading to S3 and test on-device (#4287)
Summary: Our [stable branch](https://hud.pytorch.org/hud/pytorch/executorch/viable%2Fstrict/1?per_page=50) is failing behind for a month. It seems like the android job keeps failing to consume the artifacts fetched from S3. See #4285 details. To unblock the stable branch, this PR is to temporarily disable the S3 workflow and will re-enable it later as a periodic job. And the workflow will be re-enabled as a periodic job in #4286 once #4285 is fixed Pull Request resolved: #4287 Reviewed By: dbort Differential Revision: D59839152 Pulled By: guangy10 fbshipit-source-id: 5ab85aa592c32e7a9048845cf9088eb39573b7ce
1 parent 2b54194 commit 037cfcf

File tree

1 file changed

+2
-55
lines changed

1 file changed

+2
-55
lines changed

.github/workflows/android.yml

Lines changed: 2 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ concurrency:
2222
cancel-in-progress: true
2323

2424
jobs:
25-
test-demo-android:
26-
name: test-demo-android
25+
build-demo-android:
26+
name: build-demo-android
2727
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
2828
strategy:
2929
matrix:
@@ -67,56 +67,3 @@ jobs:
6767
# Copyp AAR to S3
6868
cp executorch.aar artifacts-to-be-uploaded/tiktoken_$EXECUTORCH_USE_TIKTOKEN/
6969
cp executorch-llama.aar artifacts-to-be-uploaded/tiktoken_$EXECUTORCH_USE_TIKTOKEN/
70-
71-
# Upload the app and its test suite to S3 so that they can be downloaded by the test job
72-
upload-artifacts:
73-
needs: test-demo-android
74-
runs-on: linux.2xlarge
75-
steps:
76-
- name: Download the artifacts
77-
uses: actions/download-artifact@v3
78-
with:
79-
# The name here needs to match the name of the upload-artifact parameter
80-
name: android-apps
81-
path: ${{ runner.temp }}/artifacts/
82-
83-
- name: Verify the artifacts
84-
shell: bash
85-
working-directory: ${{ runner.temp }}/artifacts/
86-
run: |
87-
ls -lah ./
88-
89-
- name: Upload the artifacts to S3
90-
uses: seemethere/upload-artifact-s3@v5
91-
with:
92-
s3-bucket: gha-artifacts
93-
s3-prefix: |
94-
${{ github.repository }}/${{ github.run_id }}/artifact
95-
retention-days: 14
96-
if-no-files-found: ignore
97-
path: ${{ runner.temp }}/artifacts/
98-
99-
# Let's see how expensive this job is, we might want to tone it down by running it periodically
100-
test-llama-app:
101-
needs: upload-artifacts
102-
permissions:
103-
id-token: write
104-
contents: read
105-
uses: pytorch/test-infra/.github/workflows/mobile_job.yml@main
106-
with:
107-
device-type: android
108-
runner: linux.2xlarge
109-
test-infra-ref: ''
110-
# This is the ARN of ExecuTorch project on AWS
111-
project-arn: arn:aws:devicefarm:us-west-2:308535385114:project:02a2cf0f-6d9b-45ee-ba1a-a086587469e6
112-
# This is the custom Android device pool that only includes Samsung Galaxy S2x
113-
device-pool-arn: arn:aws:devicefarm:us-west-2:308535385114:devicepool:02a2cf0f-6d9b-45ee-ba1a-a086587469e6/e59f866a-30aa-4aa1-87b7-4510e5820dfa
114-
# Uploaded to S3 from the previous job, the name of the app comes from the project itself
115-
android-app-archive: https://gha-artifacts.s3.amazonaws.com/${{ github.repository }}/${{ github.run_id }}/artifact/app-debug.apk
116-
android-test-archive: https://gha-artifacts.s3.amazonaws.com/${{ github.repository }}/${{ github.run_id }}/artifact/app-debug-androidTest.apk
117-
# The test spec can be downloaded from https://ossci-assets.s3.amazonaws.com/android-llama2-device-farm-test-spec.yml
118-
test-spec: arn:aws:devicefarm:us-west-2:308535385114:upload:02a2cf0f-6d9b-45ee-ba1a-a086587469e6/abd86868-fa63-467e-a5c7-218194665a77
119-
# The exported llama2 model and its tokenizer, can be downloaded from https://ossci-assets.s3.amazonaws.com/executorch-android-llama2-7b.zip.
120-
# Among the input, this is the biggest file, so it is cached on AWS to make the test faster. Note that the file is deleted by AWS after 30
121-
# days and the job will automatically re-upload the file when that happens.
122-
extra-data: https://ossci-assets.s3.amazonaws.com/executorch-android-llama2-7b.zip

0 commit comments

Comments
 (0)