diff options
Diffstat (limited to 'lkft')
44 files changed, 1300 insertions, 99 deletions
diff --git a/lkft/common/build-aosp-member.sh b/lkft/common/build-aosp-member.sh index cc85a8d218..0c1df9d444 100755 --- a/lkft/common/build-aosp-member.sh +++ b/lkft/common/build-aosp-member.sh @@ -44,7 +44,18 @@ function build_android(){ wget -c https://android-git.linaro.org/android-build-configs.git/plain/linaro-build.sh -O linaro-build.sh chmod +x linaro-build.sh if [ -n "${ANDROID_BUILD_CONFIG}" ]; then - bash -x ./linaro-build.sh -c "${ANDROID_BUILD_CONFIG}" + opt_cu="" + if [ -n "${ANDROID_BUILD_CONFIG_REPO_URL}" ]; then + opt_branch="" + if [ -n "${ANDROID_BUILD_CONFIG_REPO_BRANCH}" ]; then + opt_branch="-b ${ANDROID_BUILD_CONFIG_REPO_BRANCH}" + fi + # shellcheck disable=SC2086 + git clone ${opt_branch} ${ANDROID_BUILD_CONFIG_REPO_URL} android-build-configs-private + opt_cu="-cu ${ANDROID_ROOT}/android-build-configs-private/${ANDROID_BUILD_CONFIG}" + fi + # shellcheck disable=SC2086 + bash -ex ./linaro-build.sh -c "${ANDROID_BUILD_CONFIG}" ${opt_cu} # ${ANDROID_BUILD_CONFIG} will be repo synced after build # shellcheck source=/dev/null source "android-build-configs/${ANDROID_BUILD_CONFIG}" @@ -56,7 +67,7 @@ function build_android(){ [ -n "${MANIFEST_URL}" ] && opt_maniefst_url="-m ${MANIFEST_URL}" [ -n "${MAKE_TARGETS}" ] && export MAKE_TARGETS # shellcheck disable=SC2086 - bash -x ./linaro-build.sh -tp "${TARGET_PRODUCT}" ${opt_maniefst_url} ${opt_manfest_branch} + bash -ex ./linaro-build.sh -tp "${TARGET_PRODUCT}" ${opt_maniefst_url} ${opt_manfest_branch} fi if [ "X${TARGET_PRODUCT}X" = "Xaosp_arm64X" ]; then # for cts vts @@ -77,6 +88,12 @@ function build_android(){ for f in ${PUBLISH_FILES}; do if [ "X${f}X" = "Xandroid-cts.zipX" ]; then f_src_path="${ANDROID_ROOT}/out/host/linux-x86/cts/android-cts.zip" + if [ "X${SPLIT_CTS}X" = "XtrueX" ]; then + split -b 4GB -d --additional-suffix=.split "${f_src_path}" "${f_src_path}." + # shellcheck disable=SC2086 + mv -vf ${f_src_path}.*.split "${DIR_PUB_SRC}/" + continue + fi elif [ "X${f}X" = "Xandroid-vts.zipX" ]; then f_src_path="${ANDROID_ROOT}/out/host/linux-x86/vts/android-vts.zip" else @@ -89,7 +106,9 @@ function build_android(){ mv -vf "${f_src_path}" "${DIR_PUB_SRC}/${f}" fi - if [ "Xramdisk.img" = "X${f}" ] || [ "Xramdisk-debug.img" = "X${f}" ] || [ "Xandroid-cts.zip" = "X${f}" ] || [ "Xandroid-vts.zip" = "X${f}" ]; then + if [ "Xramdisk.img" = "X${f}" ] || [ "Xramdisk-debug.img" = "X${f}" ] \ + || [ "Xandroid-cts.zip" = "X${f}" ] \ + || [ "Xandroid-vts.zip" = "X${f}" ]; then # files no need to compress continue else @@ -117,28 +136,31 @@ function build_android(){ # clean workspace to save space function clean_workspace(){ + # Delete sources after build to save space rm -fr "${ANDROID_ROOT}" } # export parameters for publish/job submission steps function export_parameters(){ - if [ "X${f}X" = "Xandroid-cts.zipX" ]; then + # Publish parameters + # The pinned-manifest was copied into the publist directory as pinned-manifest.xml already + cp -a "${DIR_PUB_SRC}/pinned-manifest.xml" "${WORKSPACE}/" + + if [ -n "${PUB_DEST_PATH}" ]; then + PUB_DEST_TARGET="${PUB_DEST_PATH}" + elif [ -n "${ANDROID_BUILD_CONFIG}" ]; then + PUB_DEST_TARGET="${ANDROID_BUILD_CONFIG}" + elif echo "${PUBLISH_FILES}" |grep android-cts.zip; then PUB_DEST_TARGET="android-cts" - elif [ "X${f}X" = "Xandroid-vts.zipX" ]; then + elif echo "${PUBLISH_FILES}" |grep android-vts.zip; then PUB_DEST_TARGET="android-vts" - elif [ "X${TARGET_PRODUCT}" = "Xbeagle_x15" ]; then - # beagle_x15 could not used as part of the url for snapshot site - PUB_DEST_TARGET=x15 else - PUB_DEST_TARGET=${TARGET_PRODUCT} + PUB_DEST_TARGET="${TARGET_PRODUCT}" fi - # Publish parameters - # The pinned-manifest was copied into the publist directory as pinned-manifest.xml already - cp -a "${DIR_PUB_SRC}/pinned-manifest.xml" "${WORKSPACE}" echo "PUB_DEST=android/lkft/protected/aosp/${PUB_DEST_TARGET}/${BUILD_NUMBER}" > "${WORKSPACE}/publish_parameters" echo "PUB_SRC=${DIR_PUB_SRC}" >> "${WORKSPACE}/publish_parameters" - echo "PUB_EXTRA_INC=^[^/]+\.(txt|img|xz|dtb|dtbo|zip)$|MLO|vmlinux|System.map" >> "${WORKSPACE}/publish_parameters" + echo "PUB_EXTRA_INC=^[^/]+\.(txt|img|xz|dtb|dtbo|zip|split)$|MLO|vmlinux|System.map" >> "${WORKSPACE}/publish_parameters" } function main(){ @@ -146,8 +168,8 @@ function main(){ build_android if ${IN_JENKINS} && [ -n "${WORKSPACE}" ]; then - clean_workspace export_parameters + clean_workspace fi } diff --git a/lkft/common/build-aosp.sh b/lkft/common/build-aosp.sh index 70461c678b..61be333f46 100755 --- a/lkft/common/build-aosp.sh +++ b/lkft/common/build-aosp.sh @@ -3,62 +3,53 @@ export PATH=${HOME}/bin:${PATH} export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 -#BUILD_CONFIG_FILENAME=aosp-master-x15 -#KERNEL_REPO_URL=/data/android/aosp-mirror/kernel/omap.git -#OPT_MIRROR="-m /data/android/aosp-mirror/platform/manifest.git" -#BUILD_ROOT="/data/android/aosp/pure-master/test-x15-lkft" -#CLEAN_UP=false -#IN_JENKINS=false - BUILD_ROOT="${BUILD_ROOT:-/home/buildslave/srv/aosp-public}" OPT_MIRROR="${OPT_MIRROR:-}" CLEAN_UP=${CLEAN_UP:-true} -ANDROID_ROOT="${BUILD_ROOT}/build/aosp" -DIR_PUB_SRC="${BUILD_ROOT}/dist" +ANDROID_ROOT="${BUILD_ROOT}/build/aosp-${BUILD_NUMBER}" +KERNEL_ROOT="${BUILD_ROOT}/build/kernel-${BUILD_NUMBER}" +DIR_PUB_SRC="${BUILD_ROOT}/dist-${BUILD_NUMBER}" AOSP_REPO_BACKUP="${BUILD_ROOT}/aosp-repo-backup" ANDROID_IMAGE_FILES="boot.img dtb.img dtbo.img super.img vendor.img product.img system.img system_ext.img vbmeta.img userdata.img ramdisk.img ramdisk-debug.img recovery.img cache.img" ANDROID_IMAGE_FILES="${ANDROID_IMAGE_FILES} vendor_boot-debug.img vendor_boot.img" -# functions for clean the environemnt before repo sync and build function prepare_environment(){ if [ ! -d "${BUILD_ROOT}" ]; then sudo mkdir -p "${BUILD_ROOT}" sudo chmod 777 "${BUILD_ROOT}" fi cd "${BUILD_ROOT}" +} - # clean manifest files under ${ANDROID_ROOT} - rm -rf "${ANDROID_ROOT}/.repo/manifests" "${ANDROID_ROOT}/.repo/manifests.git" "${ANDROID_ROOT}/.repo/manifests.xml" "${ANDROID_ROOT}/.repo/local_manifests" "${ANDROID_ROOT}/build-tools" "${ANDROID_ROOT}/jenkins-tools" - - # clean the build directory as it is used accross multiple builds - # by removing all files except the .repo directory - if ${CLEAN_UP}; then - rm -fr "${AOSP_REPO_BACKUP}" - if [ -d "${ANDROID_ROOT}/.repo" ]; then - mv -f "${ANDROID_ROOT}/.repo" "${AOSP_REPO_BACKUP}" - fi - rm -fr "${ANDROID_ROOT}" && mkdir -p "${ANDROID_ROOT}" - if [ -d "${AOSP_REPO_BACKUP}" ]; then - mv -f "${AOSP_REPO_BACKUP}" "${ANDROID_ROOT}/.repo" - fi +############################################################### +# Build the kernel images that would be used for the userspace +# All operations following should be done under ${KERNEL_ROOT} +############################################################### +function build_kernel(){ + if [ -z "${KERNEL_BUILD_CONFIG}" ]; then + return fi + sudo rm -fr "${KERNEL_ROOT}" && mkdir -p "${KERNEL_ROOT}" && cd "${KERNEL_ROOT}" + wget https://android-git.linaro.org/android-build-configs.git/plain/lkft/linaro-lkft.sh?h=lkft -O linaro-lkft.sh + chmod +x linaro-lkft.sh + BUILD_KERNEL_WITH_UPSTREAM_BUILD=true ./linaro-lkft.sh -c "${KERNEL_BUILD_CONFIG}" -obk + cp -vf out/"${KERNEL_BUILD_CONFIG}"/pinned-manifest/*-pinned.xml "${DIR_PUB_SRC}/kernel-pinned-manifest.xml" + cp -vf "android-build-configs/lkft/${KERNEL_BUILD_CONFIG}" "${DIR_PUB_SRC}/${KERNEL_BUILD_CONFIG}" } - ############################################################### # Build Android userspace images # All operations following should be done under ${ANDROID_ROOT} ############################################################### function build_android(){ - mkdir -p "${ANDROID_ROOT}" && cd "${ANDROID_ROOT}" - rm -fr "${DIR_PUB_SRC}" && mkdir -p "${DIR_PUB_SRC}" + sudo rm -fr "${ANDROID_ROOT}" && mkdir -p "${ANDROID_ROOT}" && cd "${ANDROID_ROOT}" rm -fr "${ANDROID_ROOT}/out/pinned-manifest" rm -fr android-build-configs linaro-build.sh wget -c https://android-git.linaro.org/android-build-configs.git/plain/linaro-build.sh -O linaro-build.sh chmod +x linaro-build.sh if [ -n "${ANDROID_BUILD_CONFIG}" ]; then - bash -x ./linaro-build.sh -c "${ANDROID_BUILD_CONFIG}" + bash -ex ./linaro-build.sh -c "${ANDROID_BUILD_CONFIG}" # ${ANDROID_BUILD_CONFIG} will be repo synced after build # shellcheck source=/dev/null source "android-build-configs/${ANDROID_BUILD_CONFIG}" @@ -70,11 +61,17 @@ function build_android(){ [ -n "${MANIFEST_URL}" ] && opt_maniefst_url="-m ${MANIFEST_URL}" [ -n "${MAKE_TARGETS}" ] && export MAKE_TARGETS # shellcheck disable=SC2086 - bash -x ./linaro-build.sh -tp "${TARGET_PRODUCT}" ${opt_maniefst_url} ${opt_manfest_branch} + bash -ex ./linaro-build.sh -tp "${TARGET_PRODUCT}" ${opt_maniefst_url} ${opt_manfest_branch} + fi + if echo "${TARGET_PRODUCT}" | grep "trunk_staging"; then + # with the main branch, there are release information, like aosp_arm64-trunk_staging + TARGET_PRODUCT=$(echo "${TARGET_PRODUCT}"|cut -d- -f1) fi if [ "X${TARGET_PRODUCT}X" = "Xaosp_arm64X" ]; then - # for cts and vts + # for cts, vts, gsi DIR_PUB_SRC_PRODUCT="${ANDROID_ROOT}/out/target/product/generic_arm64" + elif [ "X${TARGET_PRODUCT}X" = "Xbeagle_x15_autoX" ]; then + DIR_PUB_SRC_PRODUCT="${ANDROID_ROOT}/out/target/product/beagle_x15" else DIR_PUB_SRC_PRODUCT="${ANDROID_ROOT}/out/target/product/${TARGET_PRODUCT}" fi @@ -91,8 +88,16 @@ function build_android(){ for f in ${PUBLISH_FILES}; do if [ "X${f}X" = "Xandroid-cts.zipX" ]; then f_src_path="${ANDROID_ROOT}/out/host/linux-x86/cts/android-cts.zip" + if [ "X${SPLIT_CTS}X" = "XtrueX" ]; then + split -b 4GB -d --additional-suffix=.split "${f_src_path}" "${f_src_path}." + # shellcheck disable=SC2086 + mv -vf ${f_src_path}.*.split "${DIR_PUB_SRC}/" + continue + fi elif [ "X${f}X" = "Xandroid-vts.zipX" ]; then f_src_path="${ANDROID_ROOT}/out/host/linux-x86/vts/android-vts.zip" + elif [ "X${f}X" = "Xuserdebug_plat_sepolicy.cilX" ]; then + f_src_path="${DIR_PUB_SRC_PRODUCT}/debug_ramdisk/${f}" else f_src_path="${DIR_PUB_SRC_PRODUCT}/${f}" fi @@ -103,7 +108,10 @@ function build_android(){ mv -vf "${f_src_path}" "${DIR_PUB_SRC}/${f}" fi - if [ "Xramdisk.img" = "X${f}" ] || [ "Xramdisk-debug.img" = "X${f}" ] || [ "Xandroid-cts.zip" = "X${f}" ] || [ "Xandroid-vts.zip" = "X${f}" ]; then + if [ "Xramdisk.img" = "X${f}" ] || [ "Xramdisk-debug.img" = "X${f}" ] \ + || [ "Xuserdebug_plat_sepolicy.cil" = "X${f}" ] \ + || [ "Xandroid-cts.zip" = "X${f}" ] \ + || [ "Xandroid-vts.zip" = "X${f}" ]; then # files no need to compress continue else @@ -131,42 +139,62 @@ function build_android(){ # clean workspace to save space function clean_workspace(){ - cd "${ANDROID_ROOT}" # Delete sources after build to save space - rm -rf art/ dalvik/ kernel/ bionic/ developers/ libcore/ sdk/ bootable/ development/ - rm -fr libnativehelper/ system/ build/ device/ test/ build-info/ docs/ packages/ - rm -fr toolchain/ .ccache/ external/ pdk/ tools/ compatibility/ frameworks/ - rm -fr platform_testing/ vendor/ cts/ hardware/ prebuilts/ + sudo rm -fr "${ANDROID_ROOT}" + sudo rm -fr "${KERNEL_ROOT}" } # export parameters for publish/job submission steps function export_parameters(){ - if [ "X${f}X" = "Xandroid-cts.zipX" ]; then - PUB_DEST_TARGET="android-cts" - elif [ "X${f}X" = "Xandroid-vts.zipX" ]; then - PUB_DEST_TARGET="android-vts" - elif [ "X${TARGET_PRODUCT}" = "Xbeagle_x15" ]; then - # beagle_x15 could not used as part of the url for snapshot site - PUB_DEST_TARGET=x15 - else - PUB_DEST_TARGET=${TARGET_PRODUCT} - fi - # Publish parameters # The pinned-manifest was copied into the publist directory as pinned-manifest.xml already cp -a "${DIR_PUB_SRC}/pinned-manifest.xml" "${WORKSPACE}/" - echo "PUB_DEST=android/lkft/${PUB_DEST_TARGET}/${BUILD_NUMBER}" > "${WORKSPACE}/publish_parameters" + + if [ -n "${PUB_DEST_PATH}" ]; then + PUB_DEST="${PUB_DEST_PATH}/${BUILD_NUMBER}" + else + if [ -n "${ANDROID_BUILD_CONFIG}" ]; then + PUB_DEST_TARGET="${ANDROID_BUILD_CONFIG}" + elif [ "X${f}X" = "Xandroid-cts.zipX" ]; then + PUB_DEST_TARGET="android-cts" + elif [ "X${f}X" = "Xandroid-vts.zipX" ]; then + PUB_DEST_TARGET="android-vts" + elif [ "X${TARGET_PRODUCT}" = "Xbeagle_x15" ]; then + # beagle_x15 could not used as part of the url for snapshot site + PUB_DEST_TARGET=x15 + else + PUB_DEST_TARGET=${TARGET_PRODUCT} + fi + PUB_DEST="android/lkft/${PUB_DEST_TARGET}/${BUILD_NUMBER}" + fi + + echo "PUB_DEST=${PUB_DEST}" > "${WORKSPACE}/publish_parameters" echo "PUB_SRC=${DIR_PUB_SRC}" >> "${WORKSPACE}/publish_parameters" - echo "PUB_EXTRA_INC=^[^/]+\.(txt|img|xz|dtb|dtbo|zip)$|MLO|vmlinux|System.map" >> "${WORKSPACE}/publish_parameters" + echo "PUB_EXTRA_INC=^[^/]+\.(txt|img|xz|dtb|dtbo|zip|split|cil)$|MLO|vmlinux|System.map" >> "${WORKSPACE}/publish_parameters" } function main(){ + # print for debug purpose + df -h + ls -l1d ${BUILD_ROOT}/build/* || true + ls -l1d ${BUILD_ROOT}/* || true + ################ prepare_environment + rm -fr "${DIR_PUB_SRC}" && mkdir -p "${DIR_PUB_SRC}" + if [ -n "${KERNEL_BUILD_CONFIG}" ]; then + build_kernel + export LOCAL_KERNEL_HOME=${KERNEL_ROOT}/out/${KERNEL_BUILD_CONFIG}/vendor-kernel/dist + kernel_ver=$(grep GKI_KERNEL_MAKEVERSION "${KERNEL_ROOT}/out/${KERNEL_BUILD_CONFIG}/misc_info.txt" | cut -d= -f2) + if [ -z "${kernel_ver}" ]; then + kernel_ver=$(grep VENDOR_KERNEL_MAKEVERSION "${KERNEL_ROOT}/out/${KERNEL_BUILD_CONFIG}/misc_info.txt" | cut -d= -f2 ) + fi + export TARGET_KERNEL_USE=${kernel_ver} + fi build_android if ${IN_JENKINS} && [ -n "${WORKSPACE}" ]; then - clean_workspace export_parameters + clean_workspace fi } diff --git a/lkft/common/builders-v2.sh b/lkft/common/builders-v2.sh index 76651f7f80..376907e738 100755 --- a/lkft/common/builders-v2.sh +++ b/lkft/common/builders-v2.sh @@ -40,7 +40,10 @@ fi # Install ruamel.yaml and Jinja2 for submit_for_testing.py # to submit jobs -pip3 install --user --force-reinstall ruamel.yaml Jinja2 +pip3 install --user --force-reinstall ruamel.yaml Jinja2 squad-client +# install the squad-client with the default pip command +# so that the squad-client could be found +pip install --user --force-reinstall squad-client sudo apt-get update sudo apt-get install -y selinux-utils cpio diff --git a/lkft/common/publisher-v2.sh b/lkft/common/publisher-v2.sh index 20b0667421..147afe6a9f 100644 --- a/lkft/common/publisher-v2.sh +++ b/lkft/common/publisher-v2.sh @@ -13,7 +13,7 @@ if [ -n "${SNAPSHOT_SITE_BUILD_INFO_URL}" ]; then fi wget ${url_build_info} -O ${JOB_OUT_PUBLISH}/BUILD-INFO.txt -PUBLISH_COMMON_FILES="pinned-manifest.xml defconfig gki_defconfig upstream_gki_defconfig SHA256SUMS.txt" +PUBLISH_COMMON_FILES="pinned-manifest.xml defconfig gki_defconfig upstream_gki_defconfig SHA256SUMS.txt misc_info.txt" for build_config in ${ANDROID_BUILD_CONFIG}; do # the config file should be in the directory of android-build-configs/lkft # or copied to there by the linaro-lkft.sh build @@ -21,7 +21,13 @@ for build_config in ${ANDROID_BUILD_CONFIG}; do for f in ${PUBLISH_COMMON_FILES} ${PUBLISH_FILES}; do if [ -f out/${build_config}/${f} ]; then - mv -v out/${build_config}/${f} ${JOB_OUT_PUBLISH}/${build_config}-${f} + if [ "X${f}" = "Xmisc_info.txt" ]; then + # the name of misc_info.txt is used by the submit_for_testing-v2.sh + # so we can not move it, instead copy it to the workspace directory + cp -v out/${build_config}/${f} ${JOB_OUT_PUBLISH}/${build_config}-${f} + else + mv -v out/${build_config}/${f} ${JOB_OUT_PUBLISH}/${build_config}-${f} + fi fi done done diff --git a/lkft/lava-job-definitions/common/devices/dragonboard-845c b/lkft/lava-job-definitions/common/devices/dragonboard-845c index 1f391a4bce..2c42f0d3ee 100644 --- a/lkft/lava-job-definitions/common/devices/dragonboard-845c +++ b/lkft/lava-job-definitions/common/devices/dragonboard-845c @@ -15,7 +15,7 @@ tags: connection: lxc images: "partition:0": - url: "https://images.validation.linaro.org/snapshots.linaro.org/96boards/dragonboard845c/linaro/rescue/69/dragonboard-845c-bootloader-ufs-aosp-69/gpt_both0.bin" + url: "https://images.validation.linaro.org/snapshots.linaro.org/96boards/dragonboard845c/linaro/rescue/90/dragonboard-845c-bootloader-ufs-aosp-90/gpt_both0.bin" boot: url: {{DOWNLOAD_URL}}/boot.img.xz compression: xz @@ -53,6 +53,8 @@ tags: minutes: 15 method: fastboot commands: + - format:ext4 metadata + - reboot bootloader - oem select-display-panel hdmi - reboot bootloader - oem select-display-panel hdmi diff --git a/lkft/lava-job-definitions/common/devices/hikey960 b/lkft/lava-job-definitions/common/devices/hikey960 index 23dfa4f4f9..8f983873b5 100644 --- a/lkft/lava-job-definitions/common/devices/hikey960 +++ b/lkft/lava-job-definitions/common/devices/hikey960 @@ -1,6 +1,10 @@ {% extends "template-lkft.yaml" %} {% block device_type %}hi960-hikey{% endblock %} +{% block device_tags %} +tags: +- old-firmware +{% endblock device_tags %} {% block secrets %} {{ super() }} @@ -54,6 +58,9 @@ timeout: minutes: 15 method: fastboot + commands: + - format:ext4 cache + - reboot {% endblock boot_target %} {% block test_target %} diff --git a/lkft/lava-job-definitions/common/template-cts-CtsDeqpTestCases-v7a.yaml b/lkft/lava-job-definitions/common/template-cts-CtsDeqpTestCases-v7a.yaml index daeb4e9e81..0ab69f3168 100644 --- a/lkft/lava-job-definitions/common/template-cts-CtsDeqpTestCases-v7a.yaml +++ b/lkft/lava-job-definitions/common/template-cts-CtsDeqpTestCases-v7a.yaml @@ -5,7 +5,7 @@ {% block job_gobal_timeout %} timeouts: job: - minutes: 500 + minutes: 930 action: minutes: 15 connection: @@ -23,7 +23,7 @@ timeouts: - test: namespace: tlxc timeout: - minutes: 480 + minutes: 900 definitions: - repository: https://git.linaro.org/qa/test-definitions.git from: git diff --git a/lkft/lava-job-definitions/common/template-cts-CtsDeqpTestCases-v8a.yaml b/lkft/lava-job-definitions/common/template-cts-CtsDeqpTestCases-v8a.yaml index 8b750867c5..19068b46a7 100644 --- a/lkft/lava-job-definitions/common/template-cts-CtsDeqpTestCases-v8a.yaml +++ b/lkft/lava-job-definitions/common/template-cts-CtsDeqpTestCases-v8a.yaml @@ -5,7 +5,7 @@ {% block job_gobal_timeout %} timeouts: job: - minutes: 500 + minutes: 930 action: minutes: 15 connection: @@ -23,7 +23,7 @@ timeouts: - test: namespace: tlxc timeout: - minutes: 480 + minutes: 900 definitions: - repository: https://git.linaro.org/qa/test-definitions.git from: git diff --git a/lkft/lava-job-definitions/common/template-cts-CtsScopedStorageDeviceOnlyTest-v7a.yaml b/lkft/lava-job-definitions/common/template-cts-CtsScopedStorageDeviceOnlyTest-v7a.yaml new file mode 100644 index 0000000000..b5988e6fc7 --- /dev/null +++ b/lkft/lava-job-definitions/common/template-cts-CtsScopedStorageDeviceOnlyTest-v7a.yaml @@ -0,0 +1,37 @@ +{% extends device_type %} +{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-CtsScopedStorageDeviceOnlyTest-v7a{% endblock job_name %} + +{% block job_gobal_timeout %} +timeouts: + job: + minutes: 260 + action: + minutes: 15 + connection: + minutes: 2 +{% endblock job_gobal_timeout %} + +{% block job_specific_metadata %} + cts-url: "{{TEST_CTS_URL}}/android-cts.zip" + cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml" + cts-version: "{{TEST_CTS_VERSION}}" + cts-plan: "cts CtsScopedStorageDeviceOnlyTest" +{% endblock job_specific_metadata %} + +{% block test_target %} +- test: + namespace: tlxc + timeout: + minutes: 240 + definitions: + - repository: https://git.linaro.org/qa/test-definitions.git + from: git + path: automated/android/noninteractive-tradefed/tradefed.yaml + params: + TEST_PARAMS: "cts --abi armeabi-v7a -m CtsScopedStorageDeviceOnlyTest --disable-reboot" + TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip" + TEST_PATH: "android-cts" + RESULTS_FORMAT: "aggregated" + ANDROID_VERSION: "{{ANDROID_VERSION}}" + name: "cts-lkft" +{% endblock test_target %} diff --git a/lkft/lava-job-definitions/common/template-cts-CtsScopedStorageDeviceOnlyTest-v8a.yaml b/lkft/lava-job-definitions/common/template-cts-CtsScopedStorageDeviceOnlyTest-v8a.yaml new file mode 100644 index 0000000000..78c79cea31 --- /dev/null +++ b/lkft/lava-job-definitions/common/template-cts-CtsScopedStorageDeviceOnlyTest-v8a.yaml @@ -0,0 +1,37 @@ +{% extends device_type %} +{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-CtsScopedStorageDeviceOnlyTest-v8a{% endblock job_name %} + +{% block job_gobal_timeout %} +timeouts: + job: + minutes: 260 + action: + minutes: 15 + connection: + minutes: 2 +{% endblock job_gobal_timeout %} + +{% block job_specific_metadata %} + cts-url: "{{TEST_CTS_URL}}/android-cts.zip" + cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml" + cts-version: "{{TEST_CTS_VERSION}}" + cts-plan: "cts CtsScopedStorageDeviceOnlyTest" +{% endblock job_specific_metadata %} + +{% block test_target %} +- test: + namespace: tlxc + timeout: + minutes: 240 + definitions: + - repository: https://git.linaro.org/qa/test-definitions.git + from: git + path: automated/android/noninteractive-tradefed/tradefed.yaml + params: + TEST_PARAMS: "cts --abi arm64-v8a -m CtsScopedStorageDeviceOnlyTest --disable-reboot" + TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip" + TEST_PATH: "android-cts" + RESULTS_FORMAT: "aggregated" + ANDROID_VERSION: "{{ANDROID_VERSION}}" + name: "cts-lkft" +{% endblock test_target %} diff --git a/lkft/lava-job-definitions/common/template-cts-CtsWindowManagerDeviceTestCases.yaml b/lkft/lava-job-definitions/common/template-cts-CtsWindowManagerDeviceTestCases.yaml new file mode 100644 index 0000000000..3f85d421ed --- /dev/null +++ b/lkft/lava-job-definitions/common/template-cts-CtsWindowManagerDeviceTestCases.yaml @@ -0,0 +1,37 @@ +{% extends device_type %} +{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-CtsWindowManagerDeviceTestCases{% endblock job_name %} + +{% block job_gobal_timeout %} +timeouts: + job: + minutes: 260 + action: + minutes: 15 + connection: + minutes: 2 +{% endblock job_gobal_timeout %} + +{% block job_specific_metadata %} + cts-url: "{{TEST_CTS_URL}}/android-cts.zip" + cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml" + cts-version: "{{TEST_CTS_VERSION}}" + cts-plan: "cts CtsWindowManagerDeviceTestCases" +{% endblock job_specific_metadata %} + +{% block test_target %} +- test: + namespace: tlxc + timeout: + minutes: 240 + definitions: + - repository: https://git.linaro.org/qa/test-definitions.git + from: git + path: automated/android/noninteractive-tradefed/tradefed.yaml + params: + TEST_PARAMS: "cts -m CtsWindowManagerDeviceTestCases --disable-reboot" + TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip" + TEST_PATH: "android-cts" + RESULTS_FORMAT: "aggregated" + ANDROID_VERSION: "{{ANDROID_VERSION}}" + name: "cts-lkft" +{% endblock test_target %} diff --git a/lkft/lava-job-definitions/common/template-cts-excluded-v7a.yaml b/lkft/lava-job-definitions/common/template-cts-excluded-v7a.yaml new file mode 100644 index 0000000000..1629840b8e --- /dev/null +++ b/lkft/lava-job-definitions/common/template-cts-excluded-v7a.yaml @@ -0,0 +1,63 @@ +{% extends device_type %} + +{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-excluded-v7a{% endblock job_name %} + +{% block job_gobal_timeout %} +timeouts: + job: + minutes: 630 + action: + minutes: 15 + connection: + minutes: 2 +{% endblock job_gobal_timeout %} + +{% block job_specific_metadata %} + cts-url: "{{TEST_CTS_URL}}/android-cts.zip" + cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml" + cts-version: "{{TEST_CTS_VERSION}}" + cts-plan: "cts-lkft" +{% endblock job_specific_metadata %} + +{% block test_target %} +- test: + namespace: tlxc + timeout: + minutes: 600 + definitions: + - repository: https://git.linaro.org/qa/test-definitions.git + from: git + path: automated/android/noninteractive-tradefed/tradefed.yaml + params: + TEST_PARAMS: cts --abi armeabi-v7a + --include-filter CtsKeystoreTestCases + --include-filter CtsWindowManagerDeviceTestCases + --include-filter CtsDevicePolicyManagerTestCases + --include-filter CtsIdentityTestCases + --include-filter CtsJobSchedulerTestCases + --include-filter CtsIncidentHostTestCases + --include-filter CtsIncidentHostTestCases[instant] + --include-filter CtsStatsdHostTestCases[instant] + --include-filter CtsStatsdHostTestCases + --include-filter CtsPrintTestCases + --include-filter CtsPrintTestCases[instant] + --include-filter CtsFileSystemTestCases + --include-filter CtsFileSystemTestCases[instant] + --include-filter CtsUsageStatsTestCases + --include-filter CtsTrustedVoiceHostTestCases + --include-filter CtsPerfettoTestCases + --include-filter CtsShortcutHostTestCases + --include-filter CtsNativeHardwareTestCases + --include-filter CtsNativeMidiTestCases + --include-filter CtsAutoFillServiceTestCases[instant] + --include-filter CtsAutoFillServiceTestCases + --include-filter CtsBackupHostTestCases + --include-filter CtsBackupTestCases + --include-filter CtsSecurityBulletinHostTestCases + --disable-reboot + TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip" + TEST_PATH: "android-cts" + RESULTS_FORMAT: "aggregated" + ANDROID_VERSION: "{{ANDROID_VERSION}}" + name: "cts-lkft" +{% endblock test_target %} diff --git a/lkft/lava-job-definitions/common/template-cts-excluded-v8a.yaml b/lkft/lava-job-definitions/common/template-cts-excluded-v8a.yaml new file mode 100644 index 0000000000..6292dd7c2a --- /dev/null +++ b/lkft/lava-job-definitions/common/template-cts-excluded-v8a.yaml @@ -0,0 +1,63 @@ +{% extends device_type %} + +{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-excluded-v8a{% endblock job_name %} + +{% block job_gobal_timeout %} +timeouts: + job: + minutes: 630 + action: + minutes: 15 + connection: + minutes: 2 +{% endblock job_gobal_timeout %} + +{% block job_specific_metadata %} + cts-url: "{{TEST_CTS_URL}}/android-cts.zip" + cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml" + cts-version: "{{TEST_CTS_VERSION}}" + cts-plan: "cts-lkft" +{% endblock job_specific_metadata %} + +{% block test_target %} +- test: + namespace: tlxc + timeout: + minutes: 600 + definitions: + - repository: https://git.linaro.org/qa/test-definitions.git + from: git + path: automated/android/noninteractive-tradefed/tradefed.yaml + params: + TEST_PARAMS: cts --abi arm64-v8a + --include-filter CtsKeystoreTestCases + --include-filter CtsWindowManagerDeviceTestCases + --include-filter CtsDevicePolicyManagerTestCases + --include-filter CtsIdentityTestCases + --include-filter CtsJobSchedulerTestCases + --include-filter CtsIncidentHostTestCases + --include-filter CtsIncidentHostTestCases[instant] + --include-filter CtsStatsdHostTestCases[instant] + --include-filter CtsStatsdHostTestCases + --include-filter CtsPrintTestCases + --include-filter CtsPrintTestCases[instant] + --include-filter CtsFileSystemTestCases + --include-filter CtsFileSystemTestCases[instant] + --include-filter CtsUsageStatsTestCases + --include-filter CtsTrustedVoiceHostTestCases + --include-filter CtsPerfettoTestCases + --include-filter CtsShortcutHostTestCases + --include-filter CtsNativeHardwareTestCases + --include-filter CtsNativeMidiTestCases + --include-filter CtsAutoFillServiceTestCases[instant] + --include-filter CtsAutoFillServiceTestCases + --include-filter CtsBackupHostTestCases + --include-filter CtsBackupTestCases + --include-filter CtsSecurityBulletinHostTestCases + --disable-reboot + TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip" + TEST_PATH: "android-cts" + RESULTS_FORMAT: "aggregated" + ANDROID_VERSION: "{{ANDROID_VERSION}}" + name: "cts-lkft" +{% endblock test_target %} diff --git a/lkft/lava-job-definitions/common/template-cts-lkft-x15-powersave-camera.yaml b/lkft/lava-job-definitions/common/template-cts-lkft-x15-powersave-camera.yaml new file mode 100644 index 0000000000..2c0e170995 --- /dev/null +++ b/lkft/lava-job-definitions/common/template-cts-lkft-x15-powersave-camera.yaml @@ -0,0 +1,41 @@ +{% extends device_type %} + +{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-lkft-powersave-camera{% endblock job_name %} + +{% block job_gobal_timeout %} +timeouts: + job: + minutes: 360 + action: + minutes: 15 + connection: + minutes: 2 +{% endblock job_gobal_timeout %} + +{% block job_specific_metadata %} + cts-url: "{{TEST_CTS_URL}}/android-cts.zip" + cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml" + cts-version: "{{TEST_CTS_VERSION}}" + cts-plan: "cts-lkft" +{% endblock job_specific_metadata %} + +{% block test_target %} +- test: + namespace: tlxc + timeout: + minutes: 360 + definitions: + - repository: https://git.linaro.org/qa/test-definitions.git + from: git + path: automated/android/noninteractive-tradefed/tradefed.yaml + params: + SET_GOVERNOR_POWERSAVE: "true" + TEST_PARAMS: cts + --include-filter CtsCameraTestCases + --disable-reboot + TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip" + TEST_PATH: "android-cts" + RESULTS_FORMAT: "aggregated" + ANDROID_VERSION: "{{ANDROID_VERSION}}" + name: "cts-lkft" +{% endblock test_target %} diff --git a/lkft/lava-job-definitions/common/template-cts-lkft-x15-powersave-libcore.yaml b/lkft/lava-job-definitions/common/template-cts-lkft-x15-powersave-libcore.yaml new file mode 100644 index 0000000000..51dcf14ff0 --- /dev/null +++ b/lkft/lava-job-definitions/common/template-cts-lkft-x15-powersave-libcore.yaml @@ -0,0 +1,41 @@ +{% extends device_type %} + +{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-lkft-powersave-libcore{% endblock job_name %} + +{% block job_gobal_timeout %} +timeouts: + job: + minutes: 360 + action: + minutes: 15 + connection: + minutes: 2 +{% endblock job_gobal_timeout %} + +{% block job_specific_metadata %} + cts-url: "{{TEST_CTS_URL}}/android-cts.zip" + cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml" + cts-version: "{{TEST_CTS_VERSION}}" + cts-plan: "cts-lkft" +{% endblock job_specific_metadata %} + +{% block test_target %} +- test: + namespace: tlxc + timeout: + minutes: 360 + definitions: + - repository: https://git.linaro.org/qa/test-definitions.git + from: git + path: automated/android/noninteractive-tradefed/tradefed.yaml + params: + SET_GOVERNOR_POWERSAVE: "true" + TEST_PARAMS: cts + --include-filter CtsLibcoreTestCases + --disable-reboot + TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip" + TEST_PATH: "android-cts" + RESULTS_FORMAT: "aggregated" + ANDROID_VERSION: "{{ANDROID_VERSION}}" + name: "cts-lkft" +{% endblock test_target %} diff --git a/lkft/lava-job-definitions/common/template-cts-lkft-x15-powersave-no-libcore-camera-webkit.yaml b/lkft/lava-job-definitions/common/template-cts-lkft-x15-powersave-no-libcore-camera-webkit.yaml new file mode 100644 index 0000000000..0b9a0cc1e6 --- /dev/null +++ b/lkft/lava-job-definitions/common/template-cts-lkft-x15-powersave-no-libcore-camera-webkit.yaml @@ -0,0 +1,55 @@ +{% extends device_type %} + +{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-lkft{% endblock job_name %} + +{% block job_gobal_timeout %} +timeouts: + job: + minutes: 360 + action: + minutes: 15 + connection: + minutes: 2 +{% endblock job_gobal_timeout %} + +{% block job_specific_metadata %} + cts-url: "{{TEST_CTS_URL}}/android-cts.zip" + cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml" + cts-version: "{{TEST_CTS_VERSION}}" + cts-plan: "cts-lkft" +{% endblock job_specific_metadata %} + +{% block test_target %} +- test: + namespace: tlxc + timeout: + minutes: 360 + definitions: + - repository: https://git.linaro.org/qa/test-definitions.git + from: git + path: automated/android/noninteractive-tradefed/tradefed.yaml + params: + SET_GOVERNOR_POWERSAVE: "true" + TEST_PARAMS: cts + --include-filter CtsAslrMallocTestCases + --include-filter CtsBionicTestCases + --include-filter CtsBluetoothTestCases + --include-filter CtsDisplayTestCases + --include-filter CtsDramTestCases + --include-filter CtsDrmTestCases + --include-filter CtsGraphicsTestCases + --include-filter CtsHardwareTestCases + --include-filter CtsJankDeviceTestCases + --include-filter CtsJniTestCases + --include-filter CtsLibcoreLegacy22TestCases + --include-filter CtsOsTestCases + --include-filter CtsSystemUiTestCases + --include-filter CtsSystemUiRenderingTestCases + --include-filter CtsUsbTests + --disable-reboot + TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip" + TEST_PATH: "android-cts" + RESULTS_FORMAT: "aggregated" + ANDROID_VERSION: "{{ANDROID_VERSION}}" + name: "cts-lkft" +{% endblock test_target %} diff --git a/lkft/lava-job-definitions/common/template-cts-lkft-x15-powersave-webkit.yaml b/lkft/lava-job-definitions/common/template-cts-lkft-x15-powersave-webkit.yaml new file mode 100644 index 0000000000..d5525ed261 --- /dev/null +++ b/lkft/lava-job-definitions/common/template-cts-lkft-x15-powersave-webkit.yaml @@ -0,0 +1,41 @@ +{% extends device_type %} + +{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-lkft-powersave-webkit{% endblock job_name %} + +{% block job_gobal_timeout %} +timeouts: + job: + minutes: 360 + action: + minutes: 15 + connection: + minutes: 2 +{% endblock job_gobal_timeout %} + +{% block job_specific_metadata %} + cts-url: "{{TEST_CTS_URL}}/android-cts.zip" + cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml" + cts-version: "{{TEST_CTS_VERSION}}" + cts-plan: "cts-lkft" +{% endblock job_specific_metadata %} + +{% block test_target %} +- test: + namespace: tlxc + timeout: + minutes: 360 + definitions: + - repository: https://git.linaro.org/qa/test-definitions.git + from: git + path: automated/android/noninteractive-tradefed/tradefed.yaml + params: + SET_GOVERNOR_POWERSAVE: "true" + TEST_PARAMS: cts + --include-filter CtsWebkitTestCases + --disable-reboot + TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip" + TEST_PATH: "android-cts" + RESULTS_FORMAT: "aggregated" + ANDROID_VERSION: "{{ANDROID_VERSION}}" + name: "cts-lkft" +{% endblock test_target %} diff --git a/lkft/lava-job-definitions/common/template-cts-part1-v7a.yaml b/lkft/lava-job-definitions/common/template-cts-part1-v7a.yaml new file mode 100644 index 0000000000..4ca9eb6de7 --- /dev/null +++ b/lkft/lava-job-definitions/common/template-cts-part1-v7a.yaml @@ -0,0 +1,54 @@ +{% extends device_type %} + +{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-part1-v7a{% endblock job_name %} + +{% block job_gobal_timeout %} +timeouts: + job: + minutes: 500 + action: + minutes: 15 + connection: + minutes: 2 +{% endblock job_gobal_timeout %} + +{% block job_specific_metadata %} + cts-url: "{{TEST_CTS_URL}}/android-cts.zip" + cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml" + cts-version: "{{TEST_CTS_VERSION}}" + cts-plan: "cts-lkft" +{% endblock job_specific_metadata %} + +{% block test_target %} +- test: + namespace: tlxc + timeout: + minutes: 480 + definitions: + - repository: https://git.linaro.org/qa/test-definitions.git + from: git + path: automated/android/noninteractive-tradefed/tradefed.yaml + params: + TEST_PARAMS: cts --abi armeabi-v7a + --include-filter CtsContentTestCases + --include-filter CtsAppTestCases + --include-filter CtsAppTestCases[instant] + --include-filter CtsKeystorePerformanceTestCases + --include-filter CtsOsTestCases + --include-filter CtsDynamicMimeHostTestCases + --include-filter CtsInputMethodTestCases + --include-filter CtsInputMethodTestCases[instant] + --include-filter CtsJdwpTestCases[instant] + --include-filter CtsJdwpTestCases + --include-filter CtsNNAPITestCases + --include-filter CtsHostsideNetworkTests + --include-filter CtsHostsideNetworkTests[instant] + --include-filter CtsIcu4cTestCases + --include-filter CtsOsTestCases[instant] + --disable-reboot + TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip" + TEST_PATH: "android-cts" + RESULTS_FORMAT: "aggregated" + ANDROID_VERSION: "{{ANDROID_VERSION}}" + name: "cts-lkft" +{% endblock test_target %} diff --git a/lkft/lava-job-definitions/common/template-cts-part1-v8a.yaml b/lkft/lava-job-definitions/common/template-cts-part1-v8a.yaml new file mode 100644 index 0000000000..a4409e8e7c --- /dev/null +++ b/lkft/lava-job-definitions/common/template-cts-part1-v8a.yaml @@ -0,0 +1,54 @@ +{% extends device_type %} + +{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-part1-v8a{% endblock job_name %} + +{% block job_gobal_timeout %} +timeouts: + job: + minutes: 500 + action: + minutes: 15 + connection: + minutes: 2 +{% endblock job_gobal_timeout %} + +{% block job_specific_metadata %} + cts-url: "{{TEST_CTS_URL}}/android-cts.zip" + cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml" + cts-version: "{{TEST_CTS_VERSION}}" + cts-plan: "cts-lkft" +{% endblock job_specific_metadata %} + +{% block test_target %} +- test: + namespace: tlxc + timeout: + minutes: 480 + definitions: + - repository: https://git.linaro.org/qa/test-definitions.git + from: git + path: automated/android/noninteractive-tradefed/tradefed.yaml + params: + TEST_PARAMS: cts --abi arm64-v8a + --include-filter CtsContentTestCases + --include-filter CtsAppTestCases + --include-filter CtsAppTestCases[instant] + --include-filter CtsKeystorePerformanceTestCases + --include-filter CtsOsTestCases + --include-filter CtsDynamicMimeHostTestCases + --include-filter CtsInputMethodTestCases + --include-filter CtsInputMethodTestCases[instant] + --include-filter CtsJdwpTestCases[instant] + --include-filter CtsJdwpTestCases + --include-filter CtsNNAPITestCases + --include-filter CtsHostsideNetworkTests + --include-filter CtsHostsideNetworkTests[instant] + --include-filter CtsIcu4cTestCases + --include-filter CtsOsTestCases[instant] + --disable-reboot + TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip" + TEST_PATH: "android-cts" + RESULTS_FORMAT: "aggregated" + ANDROID_VERSION: "{{ANDROID_VERSION}}" + name: "cts-lkft" +{% endblock test_target %} diff --git a/lkft/lava-job-definitions/common/template-cts-part2-v7a.yaml b/lkft/lava-job-definitions/common/template-cts-part2-v7a.yaml new file mode 100644 index 0000000000..8523114224 --- /dev/null +++ b/lkft/lava-job-definitions/common/template-cts-part2-v7a.yaml @@ -0,0 +1,51 @@ +{% extends device_type %} + +{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-part2-v7a{% endblock job_name %} + +{% block job_gobal_timeout %} +timeouts: + job: + minutes: 500 + action: + minutes: 15 + connection: + minutes: 2 +{% endblock job_gobal_timeout %} + +{% block job_specific_metadata %} + cts-url: "{{TEST_CTS_URL}}/android-cts.zip" + cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml" + cts-version: "{{TEST_CTS_VERSION}}" + cts-plan: "cts-lkft" +{% endblock job_specific_metadata %} + +{% block test_target %} +- test: + namespace: tlxc + timeout: + minutes: 480 + definitions: + - repository: https://git.linaro.org/qa/test-definitions.git + from: git + path: automated/android/noninteractive-tradefed/tradefed.yaml + params: + TEST_PARAMS: cts --abi armeabi-v7a + --include-filter CtsVideoTestCases + --include-filter CtsWidgetTestCases[instant] + --include-filter CtsThemeHostTestCases + --include-filter CtsViewTestCases + --include-filter vm-tests-tf + --include-filter CtsWidgetTestCases + --include-filter CtsTelephonyTestCases + --include-filter CtsStatsdAtomHostTestCases[instant] + --include-filter CtsStatsdAtomHostTestCases + --include-filter CtsSystemUiTestCases[instant] + --include-filter CtsSystemUiTestCases + --include-filter CtsWifiTestCases + --disable-reboot + TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip" + TEST_PATH: "android-cts" + RESULTS_FORMAT: "aggregated" + ANDROID_VERSION: "{{ANDROID_VERSION}}" + name: "cts-lkft" +{% endblock test_target %} diff --git a/lkft/lava-job-definitions/common/template-cts-part2-v8a.yaml b/lkft/lava-job-definitions/common/template-cts-part2-v8a.yaml new file mode 100644 index 0000000000..e9465b9b9f --- /dev/null +++ b/lkft/lava-job-definitions/common/template-cts-part2-v8a.yaml @@ -0,0 +1,51 @@ +{% extends device_type %} + +{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-part2-v8a{% endblock job_name %} + +{% block job_gobal_timeout %} +timeouts: + job: + minutes: 500 + action: + minutes: 15 + connection: + minutes: 2 +{% endblock job_gobal_timeout %} + +{% block job_specific_metadata %} + cts-url: "{{TEST_CTS_URL}}/android-cts.zip" + cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml" + cts-version: "{{TEST_CTS_VERSION}}" + cts-plan: "cts-lkft" +{% endblock job_specific_metadata %} + +{% block test_target %} +- test: + namespace: tlxc + timeout: + minutes: 480 + definitions: + - repository: https://git.linaro.org/qa/test-definitions.git + from: git + path: automated/android/noninteractive-tradefed/tradefed.yaml + params: + TEST_PARAMS: cts --abi arm64-v8a + --include-filter CtsVideoTestCases + --include-filter CtsWidgetTestCases[instant] + --include-filter CtsThemeHostTestCases + --include-filter CtsViewTestCases + --include-filter vm-tests-tf + --include-filter CtsWidgetTestCases + --include-filter CtsTelephonyTestCases + --include-filter CtsStatsdAtomHostTestCases[instant] + --include-filter CtsStatsdAtomHostTestCases + --include-filter CtsSystemUiTestCases[instant] + --include-filter CtsSystemUiTestCases + --include-filter CtsWifiTestCases + --disable-reboot + TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip" + TEST_PATH: "android-cts" + RESULTS_FORMAT: "aggregated" + ANDROID_VERSION: "{{ANDROID_VERSION}}" + name: "cts-lkft" +{% endblock test_target %} diff --git a/lkft/lava-job-definitions/common/template-cts-part3-v7a.yaml b/lkft/lava-job-definitions/common/template-cts-part3-v7a.yaml new file mode 100644 index 0000000000..854b83fe2c --- /dev/null +++ b/lkft/lava-job-definitions/common/template-cts-part3-v7a.yaml @@ -0,0 +1,65 @@ +{% extends device_type %} + +{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-part3-v7a{% endblock job_name %} + +{% block job_gobal_timeout %} +timeouts: + job: + minutes: 500 + action: + minutes: 15 + connection: + minutes: 2 +{% endblock job_gobal_timeout %} + +{% block job_specific_metadata %} + cts-url: "{{TEST_CTS_URL}}/android-cts.zip" + cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml" + cts-version: "{{TEST_CTS_VERSION}}" + cts-plan: "cts-lkft" +{% endblock job_specific_metadata %} + +{% block test_target %} +- test: + namespace: tlxc + timeout: + minutes: 480 + definitions: + - repository: https://git.linaro.org/qa/test-definitions.git + from: git + path: automated/android/noninteractive-tradefed/tradefed.yaml + params: + TEST_PARAMS: cts --abi armeabi-v7a + --include-filter CtsMediaDrmTestCases[instant] + --include-filter CtsMediaDrmTestCases + --include-filter CtsMediaBitstreamsTestCases + --include-filter CtsInstallHostTestCases + --include-filter CtsContactsProviderTestCases + --include-filter CtsNetTestCases + --include-filter CtsSecurityHostTestCases + --include-filter CtsStagedInstallHostTestCases + --include-filter CtsPermission3TestCases + --include-filter CtsPdfTestCases + --include-filter CtsPdfTestCases[instant] + --include-filter CtsBlobStoreTestCases + --include-filter CtsSensorTestCases[instant] + --include-filter CtsSensorTestCases + --include-filter CtsExtractNativeLibsHostTestCases + --include-filter CtsMediaProviderTranscodeTests + --include-filter CtsWebkitTestCases + --include-filter CtsTextTestCases + --include-filter CtsPermissionTestCases + --include-filter CtsTextTestCases[instant] + --include-filter CtsBugreportTestCases + --include-filter CtsCameraTestCases + --include-filter CtsCameraTestCases[instant] + --include-filter CtsAppExitTestCases[instant] + --include-filter CtsLibcoreFileIOTestCases + --include-filter CtsSimpleperfTestCases + --disable-reboot + TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip" + TEST_PATH: "android-cts" + RESULTS_FORMAT: "aggregated" + ANDROID_VERSION: "{{ANDROID_VERSION}}" + name: "cts-lkft" +{% endblock test_target %} diff --git a/lkft/lava-job-definitions/common/template-cts-part3-v8a.yaml b/lkft/lava-job-definitions/common/template-cts-part3-v8a.yaml new file mode 100644 index 0000000000..a8b32445f7 --- /dev/null +++ b/lkft/lava-job-definitions/common/template-cts-part3-v8a.yaml @@ -0,0 +1,65 @@ +{% extends device_type %} + +{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-part3-v8a{% endblock job_name %} + +{% block job_gobal_timeout %} +timeouts: + job: + minutes: 500 + action: + minutes: 15 + connection: + minutes: 2 +{% endblock job_gobal_timeout %} + +{% block job_specific_metadata %} + cts-url: "{{TEST_CTS_URL}}/android-cts.zip" + cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml" + cts-version: "{{TEST_CTS_VERSION}}" + cts-plan: "cts-lkft" +{% endblock job_specific_metadata %} + +{% block test_target %} +- test: + namespace: tlxc + timeout: + minutes: 480 + definitions: + - repository: https://git.linaro.org/qa/test-definitions.git + from: git + path: automated/android/noninteractive-tradefed/tradefed.yaml + params: + TEST_PARAMS: cts --abi arm64-v8a + --include-filter CtsMediaDrmTestCases[instant] + --include-filter CtsMediaDrmTestCases + --include-filter CtsMediaBitstreamsTestCases + --include-filter CtsInstallHostTestCases + --include-filter CtsContactsProviderTestCases + --include-filter CtsNetTestCases + --include-filter CtsSecurityHostTestCases + --include-filter CtsStagedInstallHostTestCases + --include-filter CtsPermission3TestCases + --include-filter CtsPdfTestCases + --include-filter CtsPdfTestCases[instant] + --include-filter CtsBlobStoreTestCases + --include-filter CtsSensorTestCases[instant] + --include-filter CtsSensorTestCases + --include-filter CtsExtractNativeLibsHostTestCases + --include-filter CtsMediaProviderTranscodeTests + --include-filter CtsWebkitTestCases + --include-filter CtsTextTestCases + --include-filter CtsPermissionTestCases + --include-filter CtsTextTestCases[instant] + --include-filter CtsBugreportTestCases + --include-filter CtsCameraTestCases + --include-filter CtsCameraTestCases[instant] + --include-filter CtsAppExitTestCases[instant] + --include-filter CtsLibcoreFileIOTestCases + --include-filter CtsSimpleperfTestCases + --disable-reboot + TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip" + TEST_PATH: "android-cts" + RESULTS_FORMAT: "aggregated" + ANDROID_VERSION: "{{ANDROID_VERSION}}" + name: "cts-lkft" +{% endblock test_target %} diff --git a/lkft/lava-job-definitions/common/template-cts-v7a.yaml b/lkft/lava-job-definitions/common/template-cts-v7a.yaml index 413aa1ab95..538525397d 100644 --- a/lkft/lava-job-definitions/common/template-cts-v7a.yaml +++ b/lkft/lava-job-definitions/common/template-cts-v7a.yaml @@ -5,7 +5,7 @@ {% block job_gobal_timeout %} timeouts: job: - minutes: 1230 + minutes: 930 action: minutes: 15 connection: @@ -23,13 +23,67 @@ timeouts: - test: namespace: tlxc timeout: - minutes: 1200 + minutes: 900 definitions: - repository: https://git.linaro.org/qa/test-definitions.git from: git path: automated/android/noninteractive-tradefed/tradefed.yaml params: TEST_PARAMS: cts --abi armeabi-v7a + --exclude-filter CtsMediaDrmTestCases[instant] + --exclude-filter CtsMediaDrmTestCases + --exclude-filter CtsMediaBitstreamsTestCases + --exclude-filter CtsInstallHostTestCases + --exclude-filter CtsContactsProviderTestCases + --exclude-filter CtsNetTestCases + --exclude-filter CtsSecurityHostTestCases + --exclude-filter CtsStagedInstallHostTestCases + --exclude-filter CtsPermission3TestCases + --exclude-filter CtsPdfTestCases + --exclude-filter CtsPdfTestCases[instant] + --exclude-filter CtsBlobStoreTestCases + --exclude-filter CtsSensorTestCases[instant] + --exclude-filter CtsSensorTestCases + --exclude-filter CtsScopedStorageDeviceOnlyTest + --exclude-filter CtsExtractNativeLibsHostTestCases + --exclude-filter CtsMediaProviderTranscodeTests + --exclude-filter CtsWebkitTestCases + --exclude-filter CtsTextTestCases + --exclude-filter CtsPermissionTestCases + --exclude-filter CtsTextTestCases[instant] + --exclude-filter CtsBugreportTestCases + --exclude-filter CtsCameraTestCases + --exclude-filter CtsCameraTestCases[instant] + --exclude-filter CtsAppExitTestCases[instant] + --exclude-filter CtsLibcoreFileIOTestCases + --exclude-filter CtsSimpleperfTestCases + --exclude-filter CtsVideoTestCases + --exclude-filter CtsWidgetTestCases[instant] + --exclude-filter CtsThemeHostTestCases + --exclude-filter CtsViewTestCases + --exclude-filter vm-tests-tf + --exclude-filter CtsWidgetTestCases + --exclude-filter CtsTelephonyTestCases + --exclude-filter CtsStatsdAtomHostTestCases[instant] + --exclude-filter CtsStatsdAtomHostTestCases + --exclude-filter CtsSystemUiTestCases[instant] + --exclude-filter CtsSystemUiTestCases + --exclude-filter CtsWifiTestCases + --exclude-filter CtsContentTestCases + --exclude-filter CtsAppTestCases + --exclude-filter CtsAppTestCases[instant] + --exclude-filter CtsKeystorePerformanceTestCases + --exclude-filter CtsOsTestCases + --exclude-filter CtsDynamicMimeHostTestCases + --exclude-filter CtsInputMethodTestCases + --exclude-filter CtsInputMethodTestCases[instant] + --exclude-filter CtsJdwpTestCases[instant] + --exclude-filter CtsJdwpTestCases + --exclude-filter CtsNNAPITestCases + --exclude-filter CtsHostsideNetworkTests + --exclude-filter CtsHostsideNetworkTests[instant] + --exclude-filter CtsIcu4cTestCases + --exclude-filter CtsOsTestCases[instant] --exclude-filter CtsDeqpTestCases --exclude-filter CtsMediaTestCases --exclude-filter CtsMediaTestCases[instant] diff --git a/lkft/lava-job-definitions/common/template-cts-v8a.yaml b/lkft/lava-job-definitions/common/template-cts-v8a.yaml index a566315b78..a3287e14c1 100644 --- a/lkft/lava-job-definitions/common/template-cts-v8a.yaml +++ b/lkft/lava-job-definitions/common/template-cts-v8a.yaml @@ -5,7 +5,7 @@ {% block job_gobal_timeout %} timeouts: job: - minutes: 1230 + minutes: 930 action: minutes: 15 connection: @@ -23,13 +23,67 @@ timeouts: - test: namespace: tlxc timeout: - minutes: 1200 + minutes: 900 definitions: - repository: https://git.linaro.org/qa/test-definitions.git from: git path: automated/android/noninteractive-tradefed/tradefed.yaml params: TEST_PARAMS: cts --abi arm64-v8a + --exclude-filter CtsMediaDrmTestCases[instant] + --exclude-filter CtsMediaDrmTestCases + --exclude-filter CtsMediaBitstreamsTestCases + --exclude-filter CtsInstallHostTestCases + --exclude-filter CtsContactsProviderTestCases + --exclude-filter CtsNetTestCases + --exclude-filter CtsSecurityHostTestCases + --exclude-filter CtsStagedInstallHostTestCases + --exclude-filter CtsPermission3TestCases + --exclude-filter CtsPdfTestCases + --exclude-filter CtsPdfTestCases[instant] + --exclude-filter CtsBlobStoreTestCases + --exclude-filter CtsSensorTestCases[instant] + --exclude-filter CtsSensorTestCases + --exclude-filter CtsScopedStorageDeviceOnlyTest + --exclude-filter CtsExtractNativeLibsHostTestCases + --exclude-filter CtsMediaProviderTranscodeTests + --exclude-filter CtsWebkitTestCases + --exclude-filter CtsTextTestCases + --exclude-filter CtsPermissionTestCases + --exclude-filter CtsTextTestCases[instant] + --exclude-filter CtsBugreportTestCases + --exclude-filter CtsCameraTestCases + --exclude-filter CtsCameraTestCases[instant] + --exclude-filter CtsAppExitTestCases[instant] + --exclude-filter CtsLibcoreFileIOTestCases + --exclude-filter CtsSimpleperfTestCases + --exclude-filter CtsVideoTestCases + --exclude-filter CtsWidgetTestCases[instant] + --exclude-filter CtsThemeHostTestCases + --exclude-filter CtsViewTestCases + --exclude-filter vm-tests-tf + --exclude-filter CtsWidgetTestCases + --exclude-filter CtsTelephonyTestCases + --exclude-filter CtsStatsdAtomHostTestCases[instant] + --exclude-filter CtsStatsdAtomHostTestCases + --exclude-filter CtsSystemUiTestCases[instant] + --exclude-filter CtsSystemUiTestCases + --exclude-filter CtsWifiTestCases + --exclude-filter CtsContentTestCases + --exclude-filter CtsAppTestCases + --exclude-filter CtsAppTestCases[instant] + --exclude-filter CtsKeystorePerformanceTestCases + --exclude-filter CtsOsTestCases + --exclude-filter CtsDynamicMimeHostTestCases + --exclude-filter CtsInputMethodTestCases + --exclude-filter CtsInputMethodTestCases[instant] + --exclude-filter CtsJdwpTestCases[instant] + --exclude-filter CtsJdwpTestCases + --exclude-filter CtsNNAPITestCases + --exclude-filter CtsHostsideNetworkTests + --exclude-filter CtsHostsideNetworkTests[instant] + --exclude-filter CtsIcu4cTestCases + --exclude-filter CtsOsTestCases[instant] --exclude-filter CtsDeqpTestCases --exclude-filter CtsMediaTestCases --exclude-filter CtsMediaTestCases[instant] diff --git a/lkft/lava-job-definitions/common/template-lkft.yaml b/lkft/lava-job-definitions/common/template-lkft.yaml index 768e72eeff..369e0931f5 100644 --- a/lkft/lava-job-definitions/common/template-lkft.yaml +++ b/lkft/lava-job-definitions/common/template-lkft.yaml @@ -49,6 +49,7 @@ protocols: {% block protocols %} lava-lxc: name: lxc-test + template: download distribution: ubuntu release: bionic arch: amd64 @@ -117,11 +118,10 @@ actions: description: "android-boot" run: steps: - - lava-test-case "android-boot-sleep-3mins" --shell sleep 180 + - lava-test-case "android-boot-sleep-30secs" --shell sleep 30 - lava-test-case "android-boot-lsusb-v" --shell lsusb -v - - lava-test-case "android-boot-wait-for-device" --shell adb wait-for-device - - lava-test-case "android-boot-sleep-1mins" --shell adb shell sleep 60 - - lava-test-case "android-boot" --shell adb shell getprop sys.boot_completed + - lava-test-case "android-boot-boot-completed" --shell "while ! adb shell getprop sys.boot_completed|grep 1; do sleep 2; done" + - lava-test-case "android-boot-set-power-stayon" --shell adb shell su 0 svc power stayon true - lava-test-case "android-boot-screencap" --shell adb shell screencap -p /data/local/tmp/screencap.png {% block test_target %} diff --git a/lkft/lava-job-definitions/common/template-vts-CtsWindowManagerDeviceTestCases.yaml b/lkft/lava-job-definitions/common/template-vts-kernel-x15-powersave-ltp.yaml index c80479be29..5e8d4dadf0 100644 --- a/lkft/lava-job-definitions/common/template-vts-CtsWindowManagerDeviceTestCases.yaml +++ b/lkft/lava-job-definitions/common/template-vts-kernel-x15-powersave-ltp.yaml @@ -1,10 +1,10 @@ {% extends device_type %} -{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-vts-CtsWindowManagerDeviceTestCases{% endblock job_name %} +{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-vts-kernel-powersave-ltp{% endblock job_name %} {% block job_gobal_timeout %} timeouts: job: - minutes: 360 + minutes: 500 action: minutes: 15 connection: @@ -22,14 +22,15 @@ timeouts: - test: namespace: tlxc timeout: - minutes: 360 + minutes: 480 definitions: - repository: https://git.linaro.org/qa/test-definitions.git from: git path: automated/android/noninteractive-tradefed/tradefed.yaml params: + SET_GOVERNOR_POWERSAVE: "true" TEST_URL: "{{TEST_VTS_URL}}/android-vts.zip" - TEST_PARAMS: "vts -m CtsWindowManagerDeviceTestCases" + TEST_PARAMS: "vts-kernel -m vts_ltp_test_arm" TEST_PATH: "android-vts" RESULTS_FORMAT: "aggregated" ANDROID_VERSION: "{{ANDROID_VERSION}}" diff --git a/lkft/lava-job-definitions/common/template-vts-kernel-x15-powersave-no-ltp.yaml b/lkft/lava-job-definitions/common/template-vts-kernel-x15-powersave-no-ltp.yaml new file mode 100644 index 0000000000..fc994c0af2 --- /dev/null +++ b/lkft/lava-job-definitions/common/template-vts-kernel-x15-powersave-no-ltp.yaml @@ -0,0 +1,39 @@ +{% extends device_type %} +{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-vts-kernel-armeabi-v7a{% endblock job_name %} + +{% block job_gobal_timeout %} +timeouts: + job: + minutes: 500 + action: + minutes: 15 + connection: + minutes: 2 +{% endblock job_gobal_timeout %} + +{% block job_specific_metadata %} + vts-url: "{{TEST_VTS_URL}}/android-vts.zip" + vts-manifest: "{{TEST_VTS_URL}}/pinned-manifest.xml" + vts-version: "{{TEST_VTS_VERSION}}" + vts-plan: "vts-kernel" +{% endblock job_specific_metadata %} + +{% block test_target %} +- test: + namespace: tlxc + timeout: + minutes: 480 + definitions: + - repository: https://git.linaro.org/qa/test-definitions.git + from: git + path: automated/android/noninteractive-tradefed/tradefed.yaml + params: + SET_GOVERNOR_POWERSAVE: "true" + TEST_URL: "{{TEST_VTS_URL}}/android-vts.zip" + TEST_PARAMS: "vts-kernel --exclude-filter vts_ltp_test_arm" + TEST_PATH: "android-vts" + RESULTS_FORMAT: "aggregated" + ANDROID_VERSION: "{{ANDROID_VERSION}}" + TEST_REBOOT_EXPECTED: "true" + name: vts-test +{% endblock test_target %} diff --git a/lkft/lava-job-definitions/common/template-vts.yaml b/lkft/lava-job-definitions/common/template-vts.yaml index 0c2effe2b1..2db48797b5 100644 --- a/lkft/lava-job-definitions/common/template-vts.yaml +++ b/lkft/lava-job-definitions/common/template-vts.yaml @@ -29,7 +29,7 @@ timeouts: path: automated/android/noninteractive-tradefed/tradefed.yaml params: TEST_URL: "{{TEST_VTS_URL}}/android-vts.zip" - TEST_PARAMS: "vts --exclude-filter CtsWindowManagerDeviceTestCases --exclude-filter FastbootVerifyUserspaceTest --exclude-filter VtsHalAudioV4_0TargetTest" + TEST_PARAMS: "vts --exclude-filter FastbootVerifyUserspaceTest --exclude-filter VtsHalAudioV4_0TargetTest" TEST_PATH: "android-vts" RESULTS_FORMAT: "aggregated" ANDROID_VERSION: "{{ANDROID_VERSION}}" diff --git a/lkft/lava-job-definitions/docker/devices/dragonboard-845c b/lkft/lava-job-definitions/docker/devices/dragonboard-845c index a6c5e8fe6c..bf29d5705f 100644 --- a/lkft/lava-job-definitions/docker/devices/dragonboard-845c +++ b/lkft/lava-job-definitions/docker/devices/dragonboard-845c @@ -12,7 +12,7 @@ tags: to: downloads images: "partition:0": - url: "https://images.validation.linaro.org/snapshots.linaro.org/96boards/dragonboard845c/linaro/rescue/69/dragonboard-845c-bootloader-ufs-aosp-69/gpt_both0.bin" + url: "https://images.validation.linaro.org/snapshots.linaro.org/96boards/dragonboard845c/linaro/rescue/90/dragonboard-845c-bootloader-ufs-aosp-90/gpt_both0.bin" boot: url: {{DOWNLOAD_URL}}/boot.img.xz compression: xz @@ -62,6 +62,24 @@ tags: {% block boot_target %} - test: docker: + image: yongqinliu/linaro-android-docker:0.1 + timeout: + minutes: 20 + definitions: + - from: inline + path: format-metatdata.yaml + name: format-metatdata + repository: + metadata: + format: Lava-Test Test Definition 1.0 + name: format-metatdata + description: format-metatdata + run: + steps: + - lava-test-case "format-metadata" --shell fastboot format:ext4 metadata + +- test: + docker: image: yongqinliu/linaro-android-docker:0.1 timeout: minutes: 20 diff --git a/lkft/lava-job-definitions/docker/devices/hikey b/lkft/lava-job-definitions/docker/devices/hikey index 50f9a478bc..1d5d927e05 100644 --- a/lkft/lava-job-definitions/docker/devices/hikey +++ b/lkft/lava-job-definitions/docker/devices/hikey @@ -14,6 +14,18 @@ images: ptable: url: http://images.validation.linaro.org/snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/69/hikey/release/ptable-aosp-8g.img +{% if TUXSUITE_DOWNLOAD_URL is defined %} + postprocess: + docker: + image: tuxsuite/tuxsuite:0.25.0 + steps: + - apt-get update && apt-get install -y wget selinux-utils cpio rsync sudo bc curl git xz-utils + - rm -fr /linaro-android/lkft && mkdir -p /linaro-android/lkft + - wget https://android-git.linaro.org/android-build-configs.git/plain/lkft/linaro-lkft.sh?h=lkft -O /linaro-android/lkft/linaro-lkft.sh && chmod +x /linaro-android/lkft/linaro-lkft.sh + - cd /linaro-android/lkft && TUXSUITE_DOWNLOAD_URL={{TUXSUITE_DOWNLOAD_URL}} ./linaro-lkft.sh -c {{LKFT_BUILD_CONFIG}} && cd - + - for f in {{PUBLISH_FILES}}; do if echo $f|grep '\.xz$'; then [ -f /linaro-android/lkft/out/{{LKFT_BUILD_CONFIG}}/${f} ] && rm -f /linaro-android/lkft/out/{{LKFT_BUILD_CONFIG}}/$(echo ${f}|sed "s|.xz$||") && xz -d /linaro-android/lkft/out/{{LKFT_BUILD_CONFIG}}/${f}; fi;done + - for f in {{PUBLISH_FILES}}; do f_no_xz=$(echo ${f}|sed "s|.xz$||"); [ -f /linaro-android/lkft/out/{{LKFT_BUILD_CONFIG}}/${f_no_xz} ] && mv -v /linaro-android/lkft/out/{{LKFT_BUILD_CONFIG}}/${f_no_xz} /lava-downloads/${f_no_xz}; done +{% else %} boot: url: {{DOWNLOAD_URL}}/boot.img.xz compression: xz @@ -26,6 +38,7 @@ vendor: url: {{REFERENCE_BUILD_URL}}/vendor.img.xz compression: xz +{% endif %} - deploy: timeout: diff --git a/lkft/lava-job-definitions/docker/devices/hikey960 b/lkft/lava-job-definitions/docker/devices/hikey960 index 5e5c0af062..ee3bbc3037 100644 --- a/lkft/lava-job-definitions/docker/devices/hikey960 +++ b/lkft/lava-job-definitions/docker/devices/hikey960 @@ -1,6 +1,10 @@ {% extends "template-lkft.yaml" %} {% block device_type %}hi960-hikey{% endblock %} +{% block device_tags %} +tags: +- old-firmware +{% endblock device_tags %} {% block secrets %} {{ super() }} @@ -14,6 +18,18 @@ images: ptable: url: https://images.validation.linaro.org/snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/85/hikey960/release/prm_ptable.img +{% if TUXSUITE_DOWNLOAD_URL is defined %} + postprocess: + docker: + image: tuxsuite/tuxsuite:0.25.0 + steps: + - apt-get update && apt-get install -y wget selinux-utils cpio rsync sudo bc curl git xz-utils + - rm -fr /linaro-android/lkft && mkdir -p /linaro-android/lkft + - wget https://android-git.linaro.org/android-build-configs.git/plain/lkft/linaro-lkft.sh?h=lkft -O /linaro-android/lkft/linaro-lkft.sh && chmod +x /linaro-android/lkft/linaro-lkft.sh + - cd /linaro-android/lkft && TUXSUITE_DOWNLOAD_URL={{TUXSUITE_DOWNLOAD_URL}} ./linaro-lkft.sh -c {{LKFT_BUILD_CONFIG}} && cd - + - for f in {{PUBLISH_FILES}}; do if echo $f|grep '\.xz$'; then [ -f /linaro-android/lkft/out/{{LKFT_BUILD_CONFIG}}/${f} ] && rm -f /linaro-android/lkft/out/{{LKFT_BUILD_CONFIG}}/$(echo ${f}|sed "s|.xz$||") && xz -d /linaro-android/lkft/out/{{LKFT_BUILD_CONFIG}}/${f}; fi;done + - for f in {{PUBLISH_FILES}}; do f_no_xz=$(echo ${f}|sed "s|.xz$||"); [ -f /linaro-android/lkft/out/{{LKFT_BUILD_CONFIG}}/${f_no_xz} ] && mv -v /linaro-android/lkft/out/{{LKFT_BUILD_CONFIG}}/${f_no_xz} /lava-downloads/${f_no_xz}; done +{% else %} boot: url: {{DOWNLOAD_URL}}/boot.img.xz compression: xz @@ -32,6 +48,7 @@ url: {{REFERENCE_BUILD_URL}}/vendor.img.xz compression: xz {% endif %} +{% endif %} - deploy: timeout: @@ -59,6 +76,25 @@ {% endblock deploy_target %} {% block boot_target %} +- test: + docker: + image: yongqinliu/linaro-android-docker:0.1 + timeout: + minutes: 20 + definitions: + - from: inline + path: format-metatdata.yaml + name: format-metatdata + repository: + metadata: + format: Lava-Test Test Definition 1.0 + name: format-metatdata + description: format-metatdata + run: + steps: + - lava-test-case "fastboot-format-metadata" --shell fastboot format cache + - lava-test-case "fastboot-reboot-bootloader" --shell fastboot reboot bootloader + - boot: docker: image: yongqinliu/linaro-android-docker:0.1 diff --git a/lkft/lava-job-definitions/docker/template-lkft.yaml b/lkft/lava-job-definitions/docker/template-lkft.yaml index fef244f1ed..c434cfcad6 100644 --- a/lkft/lava-job-definitions/docker/template-lkft.yaml +++ b/lkft/lava-job-definitions/docker/template-lkft.yaml @@ -30,6 +30,10 @@ metadata: android.build.gsi.url: "{{ANDROID_GSI_URL}}" android.build.gsi.fingerprint: "{{ANDROID_GSI_FINGERPRINT}}" {% endif %} +{% if TUXSUITE_DOWNLOAD_URL is defined %} + tuxsuite.download.url: "{{TUXSUITE_DOWNLOAD_URL}}" +{% endif %} + lkft.build.config: "{{LKFT_BUILD_CONFIG}}" git branch: "{{KERNEL_BRANCH}}" git repo: "{{KERNEL_REPO}}" git commit: "{{KERNEL_COMMIT}}" @@ -70,11 +74,10 @@ actions: description: "android-boot" run: steps: - - lava-test-case "android-boot-sleep-3mins" --shell sleep 180 + - lava-test-case "android-boot-sleep-30secs" --shell sleep 30 - lava-test-case "android-boot-lsusb-v" --shell lsusb -v - - lava-test-case "android-boot-wait-for-device" --shell adb wait-for-device - - lava-test-case "android-boot-sleep-1mins" --shell adb shell sleep 60 - - lava-test-case "android-boot" --shell adb shell getprop sys.boot_completed + - lava-test-case "android-boot-boot-completed" --shell "while ! adb shell getprop sys.boot_completed|grep 1; do sleep 2; done" + - lava-test-case "android-boot-set-power-stayon" --shell adb shell su 0 svc power stayon true - lava-test-case "android-boot-screencap" --shell adb shell screencap -p /data/local/tmp/screencap.png {% block test_target %} diff --git a/lkft/lava-job-definitions/docker/template-vts.yaml b/lkft/lava-job-definitions/docker/template-vts.yaml index 0c2effe2b1..2db48797b5 100644 --- a/lkft/lava-job-definitions/docker/template-vts.yaml +++ b/lkft/lava-job-definitions/docker/template-vts.yaml @@ -29,7 +29,7 @@ timeouts: path: automated/android/noninteractive-tradefed/tradefed.yaml params: TEST_URL: "{{TEST_VTS_URL}}/android-vts.zip" - TEST_PARAMS: "vts --exclude-filter CtsWindowManagerDeviceTestCases --exclude-filter FastbootVerifyUserspaceTest --exclude-filter VtsHalAudioV4_0TargetTest" + TEST_PARAMS: "vts --exclude-filter FastbootVerifyUserspaceTest --exclude-filter VtsHalAudioV4_0TargetTest" TEST_PATH: "android-vts" RESULTS_FORMAT: "aggregated" ANDROID_VERSION: "{{ANDROID_VERSION}}" diff --git a/lkft/lava-job-definitions/hi6220-hikey/template-boot.yaml b/lkft/lava-job-definitions/hi6220-hikey/template-boot.yaml index b02c6c1d45..876c3fdf30 100644 --- a/lkft/lava-job-definitions/hi6220-hikey/template-boot.yaml +++ b/lkft/lava-job-definitions/hi6220-hikey/template-boot.yaml @@ -29,6 +29,7 @@ metadata: protocols: lava-lxc: name: lxc-hikey-test + template: download distribution: ubuntu release: bionic arch: amd64 diff --git a/lkft/lava-job-definitions/hi6220-hikey/template-cts.yaml b/lkft/lava-job-definitions/hi6220-hikey/template-cts.yaml index 379b884afa..06faa6c1fa 100644 --- a/lkft/lava-job-definitions/hi6220-hikey/template-cts.yaml +++ b/lkft/lava-job-definitions/hi6220-hikey/template-cts.yaml @@ -36,6 +36,7 @@ metadata: protocols: lava-lxc: name: lxc-hikey-test + template: download distribution: ubuntu release: bionic arch: amd64 diff --git a/lkft/lava-job-definitions/hi6220-hikey/template-vts-kernel.yaml b/lkft/lava-job-definitions/hi6220-hikey/template-vts-kernel.yaml index b6bb9fb66c..24e93fa30c 100644 --- a/lkft/lava-job-definitions/hi6220-hikey/template-vts-kernel.yaml +++ b/lkft/lava-job-definitions/hi6220-hikey/template-vts-kernel.yaml @@ -32,6 +32,7 @@ metadata: protocols: lava-lxc: name: lxc-hikey-test + template: download distribution: ubuntu release: bionic arch: amd64 diff --git a/lkft/lava-job-definitions/hi6220-hikey/template-vts-staging-kernel.yaml b/lkft/lava-job-definitions/hi6220-hikey/template-vts-staging-kernel.yaml index a6d35667e0..83e9827638 100644 --- a/lkft/lava-job-definitions/hi6220-hikey/template-vts-staging-kernel.yaml +++ b/lkft/lava-job-definitions/hi6220-hikey/template-vts-staging-kernel.yaml @@ -31,6 +31,7 @@ metadata: protocols: lava-lxc: name: lxc-hikey-test + template: download distribution: ubuntu release: bionic arch: amd64 diff --git a/lkft/lava-job-definitions/submit_for_testing-v2.sh b/lkft/lava-job-definitions/submit_for_testing-v2.sh index 92bb5eeda7..615f1f8db6 100755 --- a/lkft/lava-job-definitions/submit_for_testing-v2.sh +++ b/lkft/lava-job-definitions/submit_for_testing-v2.sh @@ -82,6 +82,16 @@ function update_device_template(){ sed -i "s|${default_db845c_aosp_gpu_url}|{{DOWNLOAD_URL}}/${f_img_name}|" "${f_device_template}" fi + if [ -n "${TUXSUITE_DOWNLOAD_URL}" ]; then + # for case that TUXSUITE_DOWNLOAD_URL specified, + # the images will be genereated on the lava side, + # so no need to update the REFERENCE_BUILD_URL or DOWNLOAD_URL any more + + # and for the hikey8.1 case, vendor.img will be generated with the cache.img by the linaro-lkft.sh + + return + + fi # DOWNLOAD_URL is where the generated files stored # replace REFERENCE_BUILD_URL with DOWNLOAD_URL sed -i "s|{{REFERENCE_BUILD_URL}}/${f_img_name}|{{DOWNLOAD_URL}}/${f_img_name}|" "${f_device_template}" @@ -107,20 +117,136 @@ function update_device_template(){ function download_fingerprint(){ local fingerprint_url="${1}" local fingerprint_name="${2}" - if ! wget "${fingerprint_url}" -O "${fingerprint_name}"; then + + if [ -n "${TESTDATA_SITE_PROTECTED}" ] && [ "${TESTDATA_SITE_PROTECTED}" = "True" ] \ + && echo ${fingerprint_url} | grep -q "http://testdata.linaro.org/lkft/aosp-stable/android/lkft/protected"; then + ## testdata fingerprint url: http://testdata.linaro.org/lkft/aosp-stable/android/lkft/protected/aosp/android-cts/175/build_fingerprint.txt + ## aws url: s3://validation-linaro-org/testdata/lkft/aosp-stable/android/lkft/protected/aosp/android-cts/175/build_fingerprint.txt + # shellcheck disable=SC2001 + aws_download_url=$(echo "${fingerprint_url}" | sed "s|http://testdata.linaro.org/lkft/aosp-stable/android/lkft/protected/|s3://validation-linaro-org/testdata/lkft/aosp-stable/android/lkft/protected/|") + aws s3 cp "${aws_download_url}" "${fingerprint_name}" || true + else + wget "${fingerprint_url}" -O "${fingerprint_name}" || true + fi + if [ ! -e "${fingerprint_name}" ] || [ $(wc -l "${fingerprint_name}" |awk '{print $1}') -ne 1 ]; then rm -f "${fingerprint_name}" touch "${fingerprint_name}" fi } +function create_or_update_project(){ + # to avoid the leaking fo the REGISTER_CALLBACK_TOKEN + set +x + if [ -z "${QA_REPORTS_TOKEN}" ]; then + set -x + return + fi + path_squad_client="" + if which squad-client; then + path_squad_client=$(which squad-client) + elif [ -f "${HOME}/.local/bin/squad-client" ]; then + path_squad_client="${HOME}/.local/bin/squad-client" + else + echo "squad-client not found" + set -x + return + fi + + local qa_server="${1}" + local qa_team_group="${2}" + local qa_project_private="${3}" + local qa_project_slug="${4}" + local qa_project_name="${5}" + + if [ -z "${qa_project_name}" ]; then + qa_project_name="${qa_project_slug}" + fi + + qa_project_plugins="tradefed" + + qa_project_public_settings='PLUGINS_TRADEFED_EXTRACT_AGGREGATED: True +CI_RESET_BUILD_EVENTS_ON_JOB_RESUBMISSION: True +CI_LAVA_INFRA_ERROR_MESSAGES: +- "adb device [a-zA-Z0-9]+ lost!" +- "auto-login-action timed out after [0-9]+ seconds" +- "bootloader-interrupt timed out after [0-9]+ seconds" +- "Connection closed" +- "Device NOT found!" +- "Download finished ([0-9]+ bytes) but was not expected size ([0-9]+ bytes), check your networking." +- "fastboot-flash-action timed out" +- "fastboot-boot-commands timed out after [0-9]+ seconds" +- "Failed to install android platform tools!" +- "git-repo-action timed out after [0-9]+ seconds" +- "Infrastructure error: Unable to run" +- "lava_test_shell connection dropped." +- "lava-test-shell timed out after [0-9]+ seconds" +- "lava-docker-test-shell timed out after [0-9]+ seconds" +- "login-action timed out after [0-9]+ seconds" +- "lxc-apt-install timed out after [0-9]+ seconds" +- "tradefed - adb device lost" +- "tradefed - failed to collect results and log files" +- "uboot-enter-fastboot timed out after [0-9]+ seconds" +- "Unable to apt-get update in lxc container" +- "Unable to create lxc container" +- "Unable to fetch git repository" +- "Unable to install using apt-get in lxc container" +- "/usr/local/lab-scripts/cbrxd_hub_control" +- "wait-device-boardid timed out after [0-9]+ seconds" +- "wait for prompt timed out" +' + + if [ -n "${REGISTER_CALLBACK_TOKEN}" ]; then + callback_headers_for_echo="CALLBACK_HEADERS: {PRIVATE-TOKEN: ******}" + callback_headers="CALLBACK_HEADERS: {PRIVATE-TOKEN: ${REGISTER_CALLBACK_TOKEN}}" + + qa_project_settings="${callback_headers} +${qa_project_public_settings}" + qa_project_settings_for_echo="${callback_headers_for_echo} +${qa_project_public_settings}" + else + qa_project_settings="${qa_project_public_settings}" + qa_project_settings_for_echo="${qa_project_public_settings}" + fi + + qa_projcect_public_private="--is-public" + if [ -n "${qa_project_private}" ] && [ "${qa_project_private}" = "true" ] ; then + qa_projcect_public_private="--is-private" + fi + + # enable --no-overwrite to avoid updating on the existing projects + # to avoid causing any problem for the existing projects + cmd_squad_client="${path_squad_client} --squad-host ${qa_server} --squad-token ****** create-or-update-project" + cmd_squad_client="${cmd_squad_client} --group ${qa_team_group} --slug ${qa_project_slug} --name ${qa_project_name} ${qa_projcect_public_private} --plugins ${qa_project_plugins}" + cmd_squad_client="${cmd_squad_client} --settings ${qa_project_settings_for_echo} --no-overwrite --data-retention 0" + echo "${cmd_squad_client}" + + if [ -z "${ENV_DRY_RUN_FOR_PROJECT_CREATING}" ] || [ "${ENV_DRY_RUN_FOR_PROJECT_CREATING}" = "false" ] ; then + ${path_squad_client} \ + --squad-host "${qa_server}" --squad-token "${QA_REPORTS_TOKEN}" \ + create-or-update-project \ + --group "${qa_team_group}" \ + --slug "${qa_project_slug}" \ + --name "${qa_project_name}" \ + ${qa_projcect_public_private} \ + --plugins ${qa_project_plugins} \ + --settings "${qa_project_settings}" \ + --no-overwrite \ + --data-retention 0 || true + fi + set -x + +} + function submit_jobs_for_config(){ local build_config=$1 && shift + export LKFT_BUILD_CONFIG="${build_config}" + local f_qareport_urls="qareport_url.txt" [ -z "${DEFAULT_TEST_LAVA_JOB_PRIORITY}" ] && DEFAULT_TEST_LAVA_JOB_PRIORITY="medium" # clean environments - unset TEST_DEVICE_TYPE TEST_LAVA_SERVER TEST_QA_SERVER TEST_QA_SERVER_TEAM TEST_QA_SERVER_PROJECT TEST_QA_SERVER_ENVIRONMENT + unset TEST_DEVICE_TYPE TEST_LAVA_SERVER TEST_QA_SERVER TEST_QA_SERVER_TEAM TEST_QA_SERVER_PROJECT TEST_QA_SERVER_PROJECT_NAME TEST_QA_SERVER_PROJECT_PRIVATE TEST_QA_SERVER_ENVIRONMENT unset ANDROID_VERSION KERNEL_BRANCH KERNEL_REPO TEST_METADATA_TOOLCHAIN TEST_VTS_URL TEST_CTS_URL REFERENCE_BUILD_URL ANDROID_VENDOR_FINGERPRINT unset PUBLISH_FILES TEST_OTHER_PLANS TEST_TEMPLATES_TYPE TEST_LAVA_JOB_GROUP TEST_LAVA_JOB_PRIORITY unset IMAGE_SUPPORTED_CACHE IMAGE_SUPPORTED_VENDOR_BOOT @@ -139,6 +265,7 @@ function submit_jobs_for_config(){ fi fi check_environments + export PUBLISH_FILES="${PUBLISH_FILES}" [ -z "${TEST_LAVA_JOB_GROUP}" ] && TEST_LAVA_JOB_GROUP=lkft [ -n "${TEST_LAVA_JOB_PRIORITY}" ] && DEFAULT_TEST_LAVA_JOB_PRIORITY="${TEST_LAVA_JOB_PRIORITY}" [ -z "${TEST_LAVA_JOB_PRIORITY}" ] && TEST_LAVA_JOB_PRIORITY="${DEFAULT_TEST_LAVA_JOB_PRIORITY}" @@ -148,7 +275,11 @@ function submit_jobs_for_config(){ TEST_VTS_VERSION=$(echo "${TEST_VTS_URL}" | tr -s '/' | sed 's|/$||' | awk -F"/" '{print$(NF)}') TEST_CTS_VERSION=$(echo "${TEST_CTS_URL}" | tr -s '/' | sed 's|/$||' | awk -F"/" '{print$(NF)}') - if echo "${TEST_VTS_URL}"|grep '/aosp-master-throttled/'; then + if echo "${TEST_VTS_URL}"|grep '/aosp-master/'; then + # for aosp master cts/vts packages + build_number_vts=$(echo "${TEST_VTS_URL}" | tr -s '/' | sed 's|/$||' | awk -F"/" '{print$(NF-1)}') + TEST_VTS_VERSION="aosp-master#${build_number_vts}" + elif echo "${TEST_VTS_URL}"|grep '/aosp-master-throttled/'; then # for aosp master cts/vts packages build_number_vts=$(echo "${TEST_VTS_URL}" | tr -s '/' | sed 's|/$||' | awk -F"/" '{print$(NF-1)}') TEST_VTS_VERSION="aosp-master-throttled#${build_number_vts}" @@ -162,7 +293,10 @@ function submit_jobs_for_config(){ fi fi - if echo "${TEST_CTS_URL}"|grep '/aosp-master-throttled/'; then + if echo "${TEST_CTS_URL}"|grep '/aosp-master/'; then + build_number_cts=$(echo "${TEST_CTS_URL}" | tr -s '/' | sed 's|/$||' | awk -F"/" '{print$(NF-1)}') + TEST_CTS_VERSION="aosp-master#${build_number_cts}" + elif echo "${TEST_CTS_URL}"|grep '/aosp-master-throttled/'; then build_number_cts=$(echo "${TEST_CTS_URL}" | tr -s '/' | sed 's|/$||' | awk -F"/" '{print$(NF-1)}') TEST_CTS_VERSION="aosp-master-throttled#${build_number_cts}" elif echo "${TEST_CTS_URL}"|grep '/protected/'; then @@ -221,6 +355,14 @@ function submit_jobs_for_config(){ unset IMAGE_SUPPORTED_VENDOR_BOOT fi + if [ -n "${TUXSUITE_DOWNLOAD_URL}" ]; then + # for case from gitlab pipeline + # need to export BUILD_URL="${CI_PIPELINE_URL}", BUILD_NUMBER="${CI_BUILD_ID}", JOB_NAME="${REPO_NAME}/${KERNEL_BRANCH}" + export TUXSUITE_DOWNLOAD_URL + else + unset TUXSUITE_DOWNLOAD_URL + fi + ## clean up the old changes for last build ## so that the url could be updated as expected cd ${DIR_CONFIGS_ROOT}/ && \ @@ -241,6 +383,9 @@ function submit_jobs_for_config(){ TEST_QA_SERVER_TEAM="android-lkft" fi + [ -z "${TEST_QA_SERVER_PROJECT_PRIVATE}" ] && TEST_QA_SERVER_PROJECT_PRIVATE="false" + [ -z "${TEST_QA_SERVER_PROJECT_NAME}" ] && TEST_QA_SERVER_PROJECT_NAME="${TEST_QA_SERVER_PROJECT}" + # Do not submit the default lkft test jobs when TEST_PLANS_NO_DEFAULT_LKFT is set true if [ -z "${TEST_PLANS_NO_DEFAULT_LKFT}" ] || [ "X${TEST_PLANS_NO_DEFAULT_LKFT}" != "Xtrue" ]; then local default_plans="template-boot.yaml template-vts-kernel-arm64-v8a.yaml template-vts-kernel-armeabi-v7a.yaml template-cts-lkft.yaml" @@ -254,6 +399,8 @@ function submit_jobs_for_config(){ update_device_template "${f_device_template}" "${f}" "${build_config}" "${REFERENCE_BUILD_URL}" done + create_or_update_project "${TEST_QA_SERVER}" "${TEST_QA_SERVER_TEAM}" "${TEST_QA_SERVER_PROJECT_PRIVATE}" "${TEST_QA_SERVER_PROJECT}" "${TEST_QA_SERVER_PROJECT_NAME}" + python ${DIR_CONFIGS_ROOT}/openembedded-lkft/submit_for_testing.py \ --device-type ${TEST_DEVICE_TYPE} \ --build-number ${BUILD_NUMBER} \ @@ -303,9 +450,12 @@ function submit_jobs_for_config(){ qa_server_team="${TEST_QA_SERVER_TEAM}" fi qa_server_project=$(get_value_from_config_file "TEST_QA_SERVER_PROJECT_${plan}" "${build_config}") - if [ -z "${qa_server_project}" ]; then - qa_server_project="${TEST_QA_SERVER_PROJECT}" - fi + [ -z "${qa_server_project}" ] && qa_server_project="${TEST_QA_SERVER_PROJECT}" + qa_server_project_name=$(get_value_from_config_file "TEST_QA_SERVER_PROJECT_NAME_${plan}" "${build_config}") + [ -z "${qa_server_project_name}" ] && qa_server_project_name="${qa_server_project}" + + qa_server_project_private=$(get_value_from_config_file "TEST_QA_SERVER_PROJECT_PRIVATE_${plan}" "${build_config}") + [ -z "${qa_server_project_private}" ] && qa_server_project_private="${TEST_QA_SERVER_PROJECT_PRIVATE}" lava_job_priority=$(get_value_from_config_file "TEST_LAVA_JOB_PRIORITY_${plan}" "${build_config}") if [ -n "${lava_job_priority}" ]; then @@ -320,6 +470,8 @@ function submit_jobs_for_config(){ update_device_template "${f_device_template}" "${f}" "${build_config}" "${REFERENCE_BUILD_URL}" done + create_or_update_project "${qa_server}" "${qa_server_team}" "${qa_server_project_private}" "${qa_server_project}" "${qa_server_project_name}" + python ${DIR_CONFIGS_ROOT}/openembedded-lkft/submit_for_testing.py \ --device-type ${TEST_DEVICE_TYPE} \ --build-number ${BUILD_NUMBER} \ diff --git a/lkft/lava-job-definitions/x15/template-boot.yaml b/lkft/lava-job-definitions/x15/template-boot.yaml index b5d95b7207..89a7615482 100644 --- a/lkft/lava-job-definitions/x15/template-boot.yaml +++ b/lkft/lava-job-definitions/x15/template-boot.yaml @@ -29,6 +29,7 @@ metadata: protocols: lava-lxc: name: lxc-x15-test + template: download distribution: ubuntu release: bionic arch: amd64 diff --git a/lkft/lava-job-definitions/x15/template-cts.yaml b/lkft/lava-job-definitions/x15/template-cts.yaml index 4b2e4553f5..6b0787cc41 100644 --- a/lkft/lava-job-definitions/x15/template-cts.yaml +++ b/lkft/lava-job-definitions/x15/template-cts.yaml @@ -35,6 +35,7 @@ secrets: protocols: lava-lxc: name: lxc-x15-test + template: download distribution: ubuntu release: bionic arch: amd64 diff --git a/lkft/lava-job-definitions/x15/template-vts-kernel.yaml b/lkft/lava-job-definitions/x15/template-vts-kernel.yaml index d851642495..6a3f9bd62b 100644 --- a/lkft/lava-job-definitions/x15/template-vts-kernel.yaml +++ b/lkft/lava-job-definitions/x15/template-vts-kernel.yaml @@ -36,6 +36,7 @@ secrets: protocols: lava-lxc: name: lxc-x15-test + template: download distribution: ubuntu release: bionic arch: amd64 diff --git a/lkft/lava-job-definitions/x15/template-vts-staging-kernel.yaml b/lkft/lava-job-definitions/x15/template-vts-staging-kernel.yaml index cbaaa9d837..1e0885da06 100644 --- a/lkft/lava-job-definitions/x15/template-vts-staging-kernel.yaml +++ b/lkft/lava-job-definitions/x15/template-vts-staging-kernel.yaml @@ -32,6 +32,7 @@ metadata: protocols: lava-lxc: name: lxc-x15-test + template: download distribution: ubuntu release: bionic arch: amd64 diff --git a/lkft/x15-aosp/builders.sh b/lkft/x15-aosp/builders.sh index 5ed7c8a202..7fd2e2361d 100644 --- a/lkft/x15-aosp/builders.sh +++ b/lkft/x15-aosp/builders.sh @@ -27,7 +27,7 @@ export PATH=${HOME}/bin:${PATH} cd ~/srv/aosp-master/build/ rm -rf .repo/manifests* .repo/local_manifests* out -repo init -u http://android.googlesource.com/platform/manifest -b master +repo init -u http://android.googlesource.com/platform/manifest -b main if [ ! -z ${REFERENCE_BUILD_URL} ]; then cd .repo/manifests/ wget ${REFERENCE_BUILD_URL}/pinned-manifest.xml -O default.xml |