Test 16k on Cuttlefish

This commit is contained in:
topjohnwu 2024-08-15 22:51:40 -07:00
parent e9e2ecf2dd
commit 9db2e99086
2 changed files with 11 additions and 9 deletions

View File

@ -170,7 +170,7 @@ jobs:
logcat.log logcat.log
cf_test: cf_test:
name: Test ${{ matrix.branch }} (${{ matrix.target }}) name: Test ${{ matrix.device }}
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04
needs: build needs: build
env: env:
@ -180,7 +180,9 @@ jobs:
matrix: matrix:
include: include:
- branch: "aosp-main" - branch: "aosp-main"
target: "aosp_cf_x86_64_phone-trunk_staging-userdebug" device: "aosp_cf_x86_64_phone"
- branch: "aosp-main-throttled"
device: "aosp_cf_x86_64_phone_pgagnostic"
steps: steps:
- name: Check out - name: Check out
@ -197,7 +199,7 @@ jobs:
- name: Setup Cuttlefish environment - name: Setup Cuttlefish environment
run: | run: |
scripts/cuttlefish.sh setup scripts/cuttlefish.sh setup
scripts/cuttlefish.sh download ${{ matrix.branch }} ${{ matrix.target }} scripts/cuttlefish.sh download ${{ matrix.branch }} ${{ matrix.device }}
- name: Run Cuttlefish test - name: Run Cuttlefish test
timeout-minutes: 10 timeout-minutes: 10
@ -207,7 +209,7 @@ jobs:
if: ${{ failure() }} if: ${{ failure() }}
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: "cvd-logs" name: "cvd-logs-${{ matrix.device }}"
path: | path: |
/home/runner/aosp_cf_phone/cuttlefish/instances/cvd-1/logs /home/runner/aosp_cf_phone/cuttlefish/instances/cvd-1/logs
/home/runner/aosp_cf_phone/cuttlefish/instances/cvd-1/cuttlefish_config.json /home/runner/aosp_cf_phone/cuttlefish/instances/cvd-1/cuttlefish_config.json

View File

@ -32,22 +32,22 @@ setup_env() {
download_cf() { download_cf() {
local branch=$1 local branch=$1
local target=$2 local device=$2
if [ -z $branch ]; then if [ -z $branch ]; then
branch='aosp-main' branch='aosp-main'
fi fi
if [ -z $target ]; then if [ -z $device ]; then
target='aosp_cf_x86_64_phone-trunk_staging-userdebug' device='aosp_cf_x86_64_phone'
fi fi
local device=$(echo $target | cut -d '-' -f 1) local target="${device}-trunk_staging-userdebug"
local build_id=$(curl -sL https://ci.android.com/builds/branches/${branch}/status.json | \ local build_id=$(curl -sL https://ci.android.com/builds/branches/${branch}/status.json | \
jq -r ".targets[] | select(.name == \"$target\") | .last_known_good_build") jq -r ".targets[] | select(.name == \"$target\") | .last_known_good_build")
local sys_img_url="https://ci.android.com/builds/submitted/${build_id}/${target}/latest/raw/${device}-img-${build_id}.zip" local sys_img_url="https://ci.android.com/builds/submitted/${build_id}/${target}/latest/raw/${device}-img-${build_id}.zip"
local host_pkg_url="https://ci.android.com/builds/submitted/${build_id}/${target}/latest/raw/cvd-host_package.tar.gz" local host_pkg_url="https://ci.android.com/builds/submitted/${build_id}/${target}/latest/raw/cvd-host_package.tar.gz"
print_title "* Download $branch ($build_id) $target images" print_title "* Download $target ($build_id) images"
curl -L $sys_img_url -o aosp_cf_phone-img.zip curl -L $sys_img_url -o aosp_cf_phone-img.zip
curl -LO $host_pkg_url curl -LO $host_pkg_url
rm -rf $CF_HOME rm -rf $CF_HOME