Skip to content

Commit c007f83

Browse files
committed
fix: reuse Android AVDs and prime adb before native readers
1 parent 61e7183 commit c007f83

1 file changed

Lines changed: 16 additions & 3 deletions

File tree

.github/workflows/native-android-route-reader.yml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ on:
1313
- "providers/**"
1414
- "sources.json"
1515
- "automation/nuvio-client-upstreams.json"
16+
- "automation/nuvio-client-compatibility-matrix.json"
1617
- "automation/platform-runtime-contracts.json"
1718
- "automation/nuvio-tv-runtime-contract.json"
1819
- "engine_v2/**"
@@ -37,7 +38,9 @@ on:
3738
- "scripts/gate_native_reader_result.cjs"
3839
- "scripts/build_native_reader_brain_repair.py"
3940
- "scripts/compare_native_reader_brain_repair.py"
41+
- "scripts/prime_android_lab_adb.sh"
4042
- "scripts/provider_patches/global_media_enrichment_v1.py"
43+
- "tests/native_android_avd_cache_contract_test.py"
4144
push:
4245
branches: [main]
4346
paths:
@@ -48,6 +51,7 @@ on:
4851
- "providers/**"
4952
- "sources.json"
5053
- "automation/nuvio-client-upstreams.json"
54+
- "automation/nuvio-client-compatibility-matrix.json"
5155
- "automation/platform-runtime-contracts.json"
5256
- "automation/nuvio-tv-runtime-contract.json"
5357
- "engine_v2/**"
@@ -72,7 +76,9 @@ on:
7276
- "scripts/gate_native_reader_result.cjs"
7377
- "scripts/build_native_reader_brain_repair.py"
7478
- "scripts/compare_native_reader_brain_repair.py"
79+
- "scripts/prime_android_lab_adb.sh"
7580
- "scripts/provider_patches/global_media_enrichment_v1.py"
81+
- "tests/native_android_avd_cache_contract_test.py"
7682
- ".github/workflows/native-android-route-reader.yml"
7783
workflow_dispatch:
7884

@@ -157,14 +163,16 @@ jobs:
157163
python3 niakvio/scripts/prepare_native_reader_acceptance.py tv --fixture sinners-2025 --workspace "$GITHUB_WORKSPACE" --manifest manifest.json --provider all --streams all --initial
158164
- name: Enable KVM
159165
run: if [ -e /dev/kvm ]; then sudo chmod 666 /dev/kvm || true; fi
166+
- name: Prime Android adb server
167+
run: bash niakvio/scripts/prime_android_lab_adb.sh
160168
- name: Restore TV AVD snapshot
161169
id: avd-cache
162170
uses: actions/cache@caa296126883cff596d87d8935842f9db880ef25
163171
with:
164172
path: |
165173
~/.android/avd/*
166174
~/.android/adb*
167-
key: avd-v2-${{ runner.os }}-tv-api31-android-tv-x86-tv_1080p-${{ needs.resolve.outputs.tv_sha }}-${{ needs.resolve.outputs.runtime_fingerprint }}
175+
key: avd-v3-${{ runner.os }}-tv-api31-android-tv-x86-tv_1080p
168176
- name: Create TV AVD snapshot on cache miss
169177
if: steps.avd-cache.outputs.cache-hit != 'true'
170178
uses: ReactiveCircus/android-emulator-runner@a421e43855164a8197daf9d8d40fe71c6996bb0d
@@ -253,14 +261,16 @@ jobs:
253261
python3 niakvio/scripts/harden_nuvio_mobile_device_test.py "$GITHUB_WORKSPACE/nuvio-mobile"
254262
- name: Enable KVM
255263
run: if [ -e /dev/kvm ]; then sudo chmod 666 /dev/kvm || true; fi
264+
- name: Prime Android adb server
265+
run: bash niakvio/scripts/prime_android_lab_adb.sh
256266
- name: Restore Mobile AVD snapshot
257267
id: avd-cache
258268
uses: actions/cache@caa296126883cff596d87d8935842f9db880ef25
259269
with:
260270
path: |
261271
~/.android/avd/*
262272
~/.android/adb*
263-
key: avd-v2-${{ runner.os }}-mobile-api35-google_apis-x86_64-pixel_2-${{ needs.resolve.outputs.mobile_sha }}-${{ needs.resolve.outputs.runtime_fingerprint }}
273+
key: avd-v3-${{ runner.os }}-mobile-api35-google_apis-x86_64-pixel_2
264274
- name: Create Mobile AVD snapshot on cache miss
265275
if: steps.avd-cache.outputs.cache-hit != 'true'
266276
uses: ReactiveCircus/android-emulator-runner@a421e43855164a8197daf9d8d40fe71c6996bb0d
@@ -409,6 +419,9 @@ jobs:
409419
- name: Enable KVM for candidate retest
410420
if: steps.repair.outputs.proposals != '0'
411421
run: if [ -e /dev/kvm ]; then sudo chmod 666 /dev/kvm || true; fi
422+
- name: Prime Android adb server for candidate retest
423+
if: steps.repair.outputs.proposals != '0'
424+
run: bash niakvio/scripts/prime_android_lab_adb.sh
412425
- name: Restore TV AVD snapshot for candidate retest
413426
if: steps.repair.outputs.proposals != '0'
414427
id: repair-avd-cache
@@ -417,7 +430,7 @@ jobs:
417430
path: |
418431
~/.android/avd/*
419432
~/.android/adb*
420-
key: avd-v2-${{ runner.os }}-tv-api31-android-tv-x86-tv_1080p-${{ needs.resolve.outputs.tv_sha }}-${{ needs.resolve.outputs.runtime_fingerprint }}
433+
key: avd-v3-${{ runner.os }}-tv-api31-android-tv-x86-tv_1080p
421434
- name: Create TV AVD snapshot on candidate cache miss
422435
if: steps.repair.outputs.proposals != '0' && steps.repair-avd-cache.outputs.cache-hit != 'true'
423436
uses: ReactiveCircus/android-emulator-runner@a421e43855164a8197daf9d8d40fe71c6996bb0d

0 commit comments

Comments
 (0)