sync with upstream

Change-Id: Ib5a0c2ffc9c937ce3e69405f439b35abcd6f3503
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

2 files changed, 0 insertions, 62 deletions

diff --git a/automated/android/tradefed/tradefed.sh b/automated/android/tradefed/tradefed.sh
index a03fd5a..2bcb4da 100755
--- a/automated/android/tradefed/tradefed.sh
+++ b/automated/android/tradefed/tradefed.sh
@@ -44,7 +44,6 @@ if [ -e "/home/testuser" ]; then
     export HOME=/home/testuser
 fi
 
-disable_suspend
 wait_boot_completed "${TIMEOUT}"
 disable_suspend
 # wait_homescreen() searches logcat output for
diff --git a/automated/android/tradefed/tradefed.yaml.mobile b/automated/android/tradefed/tradefed.yaml.mobile
deleted file mode 100644
index c63196b..0000000
--- a/automated/android/tradefed/tradefed.yaml.mobile
+++ /dev/null
@@ -1,61 +0,0 @@
-metadata:
-    name: cts
-    format: "Lava-Test-Shell Test Definition 1.0"
-    description: "Run tradefed based tests in LAVA."
-    maintainer:
-        - milosz.wasilewski@linaro.org
-        - chase.qi@linaro.org
-    os:
-        - debian
-        - ubuntu
-    devices:
-        - lxc
-    scope:
-        - functional
-
-params:
-    SKIP_INSTALL: "false"
-    # Specify timeout in seconds for wait_boot_completed and wait_homescreen.
-    TIMEOUT: "300"
-    # Download CTS package or copy it from local disk.
-    # CTS_URL: "/root/android-cts/linaro/7.1_r1/android-cts-7.1_r1.zip"
-    TEST_URL: "http://testdata.validation.linaro.org/cts/android-cts-7.1_r1.zip"
-    TEST_PARAMS: "run cts -m CtsBionicTestCases --abi arm64-v8a --disable-reboot --skip-preconditions --skip-device-info"
-    # set to the name of the top directory in TEST_URL archive
-    # This should be 'android-cts' for CTS and android-vts for VTS
-    TEST_PATH: "android-cts"
-    # Specify result format: aggregated or atomic
-    RESULTS_FORMAT: "aggregated"
-    # Specify url and token for file uploading.
-    URL: "https://archive.validation.linaro.org/artifacts/team/mobile/"
-    TOKEN: ""
-    AP_SSID: ""
-    AP_KEY: ""
-    # Specify the failures number to be printed
-    FAILURES_PRINTED: "0"
-
-run:
-    steps:
-        - cd ./automated/android/tradefed
-        # Run setup.sh in the original shell to reserve env variables.
-        - . ./setup.sh
-        - echo "after ./setup.sh"
-        # delete the test user to clean environment
-        - userdel testuser -r -f || true
-        # create test use to run the cts/vts tests
-        - useradd -m testuser && echo "testuser created successfully"
-        - chown testuser:testuser .
-        - sudo -u testuser ./tradefed.sh  -o "${TIMEOUT}" -c "${TEST_URL}" -t "${TEST_PARAMS}" -p "${TEST_PATH}" -r "${RESULTS_FORMAT}" -n "${ANDROID_SERIAL}" -f "${FAILURES_PRINTED}"
-        # Upload test log and result files to artifactorial.
-        - cp -r ./${TEST_PATH}/results ./output/ || true
-        - cp -r ./${TEST_PATH}/logs ./output/ || true
-        # Include logs dumped from TF shell 'd l' command.
-        - if ls /tmp/tradefed*; then cp -r /tmp/tradefed* ./output || true; fi
-        - tar caf tradefed-output-$(date +%Y%m%d%H%M%S).tar.xz ./output
-        - ATTACHMENT=$(ls tradefed-output-*.tar.xz)
-        - ../../utils/upload-to-artifactorial.sh -a "${ATTACHMENT}" -u "${URL}" -t "${TOKEN}"
-        # Send test result to LAVA.
-        - ../../utils/send-to-lava.sh ./output/result.txt
-        - userdel testuser -f -r || true
-        # When adb device lost, end test job to mark it as 'incomplete'.
-        - if ! adb shell echo ok; then error_fatal "adb device $ANDROID_SERIAL lost!"; fi