From 59ecbaaac08da32dfbe8965d33b6a838bc789008 Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Wed, 25 Jun 2025 17:34:03 +0200 Subject: [PATCH] ci/android: support issuing custom commands before running Android CTS Some Android build may require some specific setup before running Android CTS, for example switching to a user different than 0, or setting some properties. Add a mechanism to issue such commands in a generic way. The job definition will have to set the `ANDROID_CTS_PREPARE_COMMAND` variable with the desired command to execute right before running Android CTS. Part-of: --- .gitlab-ci/android-cts-runner.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci/android-cts-runner.sh b/.gitlab-ci/android-cts-runner.sh index 52fa1624ef4..8ae93d12fba 100755 --- a/.gitlab-ci/android-cts-runner.sh +++ b/.gitlab-ci/android-cts-runner.sh @@ -31,6 +31,10 @@ fi INCLUDE_FILTERS="$(grep -v -E "(^#|^[[:space:]]*$)" "$INCLUDE_FILE" | sed -e 's/\s*$//g' -e 's/.*/--include-filter "\0" /g')" +if [ -n "${ANDROID_CTS_PREPARE_COMMAND:-}" ]; then + eval "$ANDROID_CTS_PREPARE_COMMAND" +fi + set +e eval "/android-cts/tools/cts-tradefed" run commandAndExit cts-dev \ $INCLUDE_FILTERS \