android hikey-v2 & x15-v2: update cts package version to 8.1-r5

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

30 files changed, 30 insertions, 30 deletions

diff --git a/android/hikey-v2/template-cts-focused1-v7a.yaml b/android/hikey-v2/template-cts-focused1-v7a.yaml
index 57448bf..d24f04e 100644
--- a/android/hikey-v2/template-cts-focused1-v7a.yaml
+++ b/android/hikey-v2/template-cts-focused1-v7a.yaml
@@ -126,6 +126,6 @@ actions:
       path: automated/android/tradefed/tradefed.yaml
       params:
         TEST_PARAMS: "run cts-focused1 --abi armeabi-v7a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r4-linux_x86-arm-linaro.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r5-linux_x86-arm-linaro.zip"
         FAILURES_PRINTED: "300"
       name: cts-focused1-v7a
diff --git a/android/hikey-v2/template-cts-focused1-v8a.yaml b/android/hikey-v2/template-cts-focused1-v8a.yaml
index 406dc6d..a308dfd 100644
--- a/android/hikey-v2/template-cts-focused1-v8a.yaml
+++ b/android/hikey-v2/template-cts-focused1-v8a.yaml
@@ -126,6 +126,6 @@ actions:
       path: automated/android/tradefed/tradefed.yaml
       params:
         TEST_PARAMS: "run cts-focused1 --abi arm64-v8a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r4-linux_x86-arm-linaro.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r5-linux_x86-arm-linaro.zip"
         FAILURES_PRINTED: "300"
       name: cts-focused1-v8a
diff --git a/android/hikey-v2/template-cts-focused2-v7a.yaml b/android/hikey-v2/template-cts-focused2-v7a.yaml
index aeecd98..3211df4 100644
--- a/android/hikey-v2/template-cts-focused2-v7a.yaml
+++ b/android/hikey-v2/template-cts-focused2-v7a.yaml
@@ -126,6 +126,6 @@ actions:
       path: automated/android/tradefed/tradefed.yaml
       params:
         TEST_PARAMS: "run cts-focused2 --abi armeabi-v7a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r4-linux_x86-arm-linaro.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r5-linux_x86-arm-linaro.zip"
         FAILURES_PRINTED: "300"
       name: cts-focused2-v7a
diff --git a/android/hikey-v2/template-cts-focused2-v8a.yaml b/android/hikey-v2/template-cts-focused2-v8a.yaml
index 3747786..bb8739f 100644
--- a/android/hikey-v2/template-cts-focused2-v8a.yaml
+++ b/android/hikey-v2/template-cts-focused2-v8a.yaml
@@ -126,6 +126,6 @@ actions:
       path: automated/android/tradefed/tradefed.yaml
       params:
         TEST_PARAMS: "run cts-focused2 --abi arm64-v8a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r4-linux_x86-arm-linaro.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r5-linux_x86-arm-linaro.zip"
         FAILURES_PRINTED: "300"
       name: cts-focused2-v8a
diff --git a/android/hikey-v2/template-cts-media-v7a.yaml b/android/hikey-v2/template-cts-media-v7a.yaml
index bc77f01..9edf01d 100644
--- a/android/hikey-v2/template-cts-media-v7a.yaml
+++ b/android/hikey-v2/template-cts-media-v7a.yaml
@@ -128,6 +128,6 @@ actions:
       path: automated/android/tradefed/tradefed.yaml
       params:
         TEST_PARAMS: "run cts-media --abi armeabi-v7a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r4-linux_x86-arm-linaro.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r5-linux_x86-arm-linaro.zip"
         FAILURES_PRINTED: "300"
       name: cts-media-v7a
diff --git a/android/hikey-v2/template-cts-media-v8a.yaml b/android/hikey-v2/template-cts-media-v8a.yaml
index b00600a..23d3ea3 100644
--- a/android/hikey-v2/template-cts-media-v8a.yaml
+++ b/android/hikey-v2/template-cts-media-v8a.yaml
@@ -128,6 +128,6 @@ actions:
       path: automated/android/tradefed/tradefed.yaml
       params:
         TEST_PARAMS: "run cts-media --abi arm64-v8a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r4-linux_x86-arm-linaro.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r5-linux_x86-arm-linaro.zip"
         FAILURES_PRINTED: "300"
       name: cts-media-v8a
diff --git a/android/hikey-v2/template-cts-media2-v7a.yaml b/android/hikey-v2/template-cts-media2-v7a.yaml
index f3d34e6..6833195 100644
--- a/android/hikey-v2/template-cts-media2-v7a.yaml
+++ b/android/hikey-v2/template-cts-media2-v7a.yaml
@@ -126,6 +126,6 @@ actions:
       path: automated/android/tradefed/tradefed.yaml
       params:
         TEST_PARAMS: "run cts-media2 --abi armeabi-v7a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r4-linux_x86-arm-linaro.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r5-linux_x86-arm-linaro.zip"
         FAILURES_PRINTED: "300"
       name: cts-media2-v7a
diff --git a/android/hikey-v2/template-cts-media2-v8a.yaml b/android/hikey-v2/template-cts-media2-v8a.yaml
index a35644a..b15f570 100644
--- a/android/hikey-v2/template-cts-media2-v8a.yaml
+++ b/android/hikey-v2/template-cts-media2-v8a.yaml
@@ -126,6 +126,6 @@ actions:
       path: automated/android/tradefed/tradefed.yaml
       params:
         TEST_PARAMS: "run cts-media2 --abi arm64-v8a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r4-linux_x86-arm-linaro.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r5-linux_x86-arm-linaro.zip"
         FAILURES_PRINTED: "300"
       name: cts-media2-v8a
diff --git a/android/hikey-v2/template-cts-opengl-v7a.yaml b/android/hikey-v2/template-cts-opengl-v7a.yaml
index 8da45c5..ea0fd0d 100644
--- a/android/hikey-v2/template-cts-opengl-v7a.yaml
+++ b/android/hikey-v2/template-cts-opengl-v7a.yaml
@@ -126,6 +126,6 @@ actions:
       path: automated/android/tradefed/tradefed.yaml
       params:
         TEST_PARAMS: "run cts-opengl --abi armeabi-v7a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r4-linux_x86-arm-linaro.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r5-linux_x86-arm-linaro.zip"
         FAILURES_PRINTED: "300"
       name: cts-opengl-v7a
diff --git a/android/hikey-v2/template-cts-opengl-v8a.yaml b/android/hikey-v2/template-cts-opengl-v8a.yaml
index b4cdb03..749cc72 100644
--- a/android/hikey-v2/template-cts-opengl-v8a.yaml
+++ b/android/hikey-v2/template-cts-opengl-v8a.yaml
@@ -126,6 +126,6 @@ actions:
       path: automated/android/tradefed/tradefed.yaml
       params:
         TEST_PARAMS: "run cts-opengl --abi arm64-v8a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r4-linux_x86-arm-linaro.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r5-linux_x86-arm-linaro.zip"
         FAILURES_PRINTED: "300"
       name: cts-opengl-v8a
diff --git a/android/hikey-v2/template-cts-part1-v7a.yaml b/android/hikey-v2/template-cts-part1-v7a.yaml
index 03c43a8..cf97868 100644
--- a/android/hikey-v2/template-cts-part1-v7a.yaml
+++ b/android/hikey-v2/template-cts-part1-v7a.yaml
@@ -126,6 +126,6 @@ actions:
       path: automated/android/tradefed/tradefed.yaml
       params:
         TEST_PARAMS: "run cts-part1 --abi armeabi-v7a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r4-linux_x86-arm-linaro.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r5-linux_x86-arm-linaro.zip"
         FAILURES_PRINTED: "300"
       name: cts-part1-v7a
diff --git a/android/hikey-v2/template-cts-part1-v8a.yaml b/android/hikey-v2/template-cts-part1-v8a.yaml
index 5424cbb..cda659c 100644
--- a/android/hikey-v2/template-cts-part1-v8a.yaml
+++ b/android/hikey-v2/template-cts-part1-v8a.yaml
@@ -126,6 +126,6 @@ actions:
       path: automated/android/tradefed/tradefed.yaml
       params:
         TEST_PARAMS: "run cts-part1 --abi arm64-v8a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r4-linux_x86-arm-linaro.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r5-linux_x86-arm-linaro.zip"
         FAILURES_PRINTED: "300"
       name: cts-part1-v8a
diff --git a/android/hikey-v2/template-cts-part2-v7a.yaml b/android/hikey-v2/template-cts-part2-v7a.yaml
index d8dc56d..bf77b9c 100644
--- a/android/hikey-v2/template-cts-part2-v7a.yaml
+++ b/android/hikey-v2/template-cts-part2-v7a.yaml
@@ -128,6 +128,6 @@ actions:
       path: automated/android/tradefed/tradefed.yaml
       params:
         TEST_PARAMS: "run cts-part2 --abi armeabi-v7a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r4-linux_x86-arm-linaro.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r5-linux_x86-arm-linaro.zip"
         FAILURES_PRINTED: "300"
       name: cts-part2-v7a
diff --git a/android/hikey-v2/template-cts-part2-v8a.yaml b/android/hikey-v2/template-cts-part2-v8a.yaml
index be39e27..bf85335 100644
--- a/android/hikey-v2/template-cts-part2-v8a.yaml
+++ b/android/hikey-v2/template-cts-part2-v8a.yaml
@@ -128,6 +128,6 @@ actions:
       path: automated/android/tradefed/tradefed.yaml
       params:
         TEST_PARAMS: "run cts-part2 --abi arm64-v8a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r4-linux_x86-arm-linaro.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r5-linux_x86-arm-linaro.zip"
         FAILURES_PRINTED: "300"
       name: cts-part2-v8a
diff --git a/android/hikey-v2/template-cts-part3-v7a.yaml b/android/hikey-v2/template-cts-part3-v7a.yaml
index 8a2f942..f737cd2 100644
--- a/android/hikey-v2/template-cts-part3-v7a.yaml
+++ b/android/hikey-v2/template-cts-part3-v7a.yaml
@@ -126,6 +126,6 @@ actions:
       path: automated/android/tradefed/tradefed.yaml
       params:
         TEST_PARAMS: "run cts-part3 --abi armeabi-v7a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r4-linux_x86-arm-linaro.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r5-linux_x86-arm-linaro.zip"
         FAILURES_PRINTED: "300"
       name: cts-part3-v7a
diff --git a/android/hikey-v2/template-cts-part3-v8a.yaml b/android/hikey-v2/template-cts-part3-v8a.yaml
index 96aa78e..60f6d12 100644
--- a/android/hikey-v2/template-cts-part3-v8a.yaml
+++ b/android/hikey-v2/template-cts-part3-v8a.yaml
@@ -126,6 +126,6 @@ actions:
       path: automated/android/tradefed/tradefed.yaml
       params:
         TEST_PARAMS: "run cts-part3 --abi arm64-v8a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r4-linux_x86-arm-linaro.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r5-linux_x86-arm-linaro.zip"
         FAILURES_PRINTED: "300"
       name: cts-part3-v8a
diff --git a/android/hikey-v2/template-cts-part4-v7a.yaml b/android/hikey-v2/template-cts-part4-v7a.yaml
index fa03832..b8ca561 100644
--- a/android/hikey-v2/template-cts-part4-v7a.yaml
+++ b/android/hikey-v2/template-cts-part4-v7a.yaml
@@ -126,6 +126,6 @@ actions:
       path: automated/android/tradefed/tradefed.yaml
       params:
         TEST_PARAMS: "run cts-part4 --abi armeabi-v7a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r4-linux_x86-arm-linaro.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r5-linux_x86-arm-linaro.zip"
         FAILURES_PRINTED: "300"
       name: cts-part4-v7a
diff --git a/android/hikey-v2/template-cts-part4-v8a.yaml b/android/hikey-v2/template-cts-part4-v8a.yaml
index 10c7813..df5cee1 100644
--- a/android/hikey-v2/template-cts-part4-v8a.yaml
+++ b/android/hikey-v2/template-cts-part4-v8a.yaml
@@ -126,6 +126,6 @@ actions:
       path: automated/android/tradefed/tradefed.yaml
       params:
         TEST_PARAMS: "run cts-part4 --abi arm64-v8a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r4-linux_x86-arm-linaro.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r5-linux_x86-arm-linaro.zip"
         FAILURES_PRINTED: "300"
       name: cts-part4-v8a
diff --git a/android/hikey-v2/template-cts-part5-v7a.yaml b/android/hikey-v2/template-cts-part5-v7a.yaml
index f7b1800..b70c2c6 100644
--- a/android/hikey-v2/template-cts-part5-v7a.yaml
+++ b/android/hikey-v2/template-cts-part5-v7a.yaml
@@ -126,6 +126,6 @@ actions:
       path: automated/android/tradefed/tradefed.yaml
       params:
         TEST_PARAMS: "run cts-part5 --abi armeabi-v7a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r4-linux_x86-arm-linaro.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r5-linux_x86-arm-linaro.zip"
         FAILURES_PRINTED: "300"
       name: cts-part5-v7a
diff --git a/android/hikey-v2/template-cts-part5-v8a.yaml b/android/hikey-v2/template-cts-part5-v8a.yaml
index 6ae7380..74867e7 100644
--- a/android/hikey-v2/template-cts-part5-v8a.yaml
+++ b/android/hikey-v2/template-cts-part5-v8a.yaml
@@ -126,6 +126,6 @@ actions:
       path: automated/android/tradefed/tradefed.yaml
       params:
         TEST_PARAMS: "run cts-part5 --abi arm64-v8a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r4-linux_x86-arm-linaro.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r5-linux_x86-arm-linaro.zip"
         FAILURES_PRINTED: "300"
       name: cts-part5-v8a
diff --git a/android/x15-v2/template-cts-focused1-v7a.yaml b/android/x15-v2/template-cts-focused1-v7a.yaml
index fa12c61..5a4bebc 100644
--- a/android/x15-v2/template-cts-focused1-v7a.yaml
+++ b/android/x15-v2/template-cts-focused1-v7a.yaml
@@ -104,6 +104,6 @@ actions:
       path: automated/android/tradefed/tradefed.yaml
       params:
         TEST_PARAMS: "run cts-focused1 --abi armeabi-v7a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r4-linux_x86-arm-linaro.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r5-linux_x86-arm-linaro.zip"
         FAILURES_PRINTED: "300"
       name: cts-focused1-v7a
diff --git a/android/x15-v2/template-cts-focused2-v7a.yaml b/android/x15-v2/template-cts-focused2-v7a.yaml
index 67d3228..ae3f67a 100644
--- a/android/x15-v2/template-cts-focused2-v7a.yaml
+++ b/android/x15-v2/template-cts-focused2-v7a.yaml
@@ -104,6 +104,6 @@ actions:
       path: automated/android/tradefed/tradefed.yaml
       params:
         TEST_PARAMS: "run cts-focused2 --abi armeabi-v7a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r4-linux_x86-arm-linaro.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r5-linux_x86-arm-linaro.zip"
         FAILURES_PRINTED: "300"
       name: cts-focused2-v7a
diff --git a/android/x15-v2/template-cts-media-v7a.yaml b/android/x15-v2/template-cts-media-v7a.yaml
index 3648a8a..711ca99 100644
--- a/android/x15-v2/template-cts-media-v7a.yaml
+++ b/android/x15-v2/template-cts-media-v7a.yaml
@@ -106,6 +106,6 @@ actions:
       path: automated/android/tradefed/tradefed.yaml
       params:
         TEST_PARAMS: "run cts-media --abi armeabi-v7a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r4-linux_x86-arm-linaro.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r5-linux_x86-arm-linaro.zip"
         FAILURES_PRINTED: "300"
       name: cts-media-v7a
diff --git a/android/x15-v2/template-cts-media2-v7a.yaml b/android/x15-v2/template-cts-media2-v7a.yaml
index d03710e..9a02300 100644
--- a/android/x15-v2/template-cts-media2-v7a.yaml
+++ b/android/x15-v2/template-cts-media2-v7a.yaml
@@ -104,6 +104,6 @@ actions:
       path: automated/android/tradefed/tradefed.yaml
       params:
         TEST_PARAMS: "run cts-media2 --abi armeabi-v7a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r4-linux_x86-arm-linaro.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r5-linux_x86-arm-linaro.zip"
         FAILURES_PRINTED: "300"
       name: cts-media2-v7a
diff --git a/android/x15-v2/template-cts-opengl-v7a.yaml b/android/x15-v2/template-cts-opengl-v7a.yaml
index 90d0ce3..8dc1509 100644
--- a/android/x15-v2/template-cts-opengl-v7a.yaml
+++ b/android/x15-v2/template-cts-opengl-v7a.yaml
@@ -104,6 +104,6 @@ actions:
       path: automated/android/tradefed/tradefed.yaml
       params:
         TEST_PARAMS: "run cts-opengl --abi armeabi-v7a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r4-linux_x86-arm-linaro.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r5-linux_x86-arm-linaro.zip"
         FAILURES_PRINTED: "300"
       name: cts-opengl-v7a
diff --git a/android/x15-v2/template-cts-part1-v7a.yaml b/android/x15-v2/template-cts-part1-v7a.yaml
index 46150b2..3fe3708 100644
--- a/android/x15-v2/template-cts-part1-v7a.yaml
+++ b/android/x15-v2/template-cts-part1-v7a.yaml
@@ -104,6 +104,6 @@ actions:
       path: automated/android/tradefed/tradefed.yaml
       params:
         TEST_PARAMS: "run cts-part1 --abi armeabi-v7a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r4-linux_x86-arm-linaro.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r5-linux_x86-arm-linaro.zip"
         FAILURES_PRINTED: "300"
       name: cts-part1-v7a
diff --git a/android/x15-v2/template-cts-part2-v7a.yaml b/android/x15-v2/template-cts-part2-v7a.yaml
index 5b7a704..bdb471c 100644
--- a/android/x15-v2/template-cts-part2-v7a.yaml
+++ b/android/x15-v2/template-cts-part2-v7a.yaml
@@ -106,6 +106,6 @@ actions:
       path: automated/android/tradefed/tradefed.yaml
       params:
         TEST_PARAMS: "run cts-part2 --abi armeabi-v7a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r4-linux_x86-arm-linaro.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r5-linux_x86-arm-linaro.zip"
         FAILURES_PRINTED: "300"
       name: cts-part2-v7a
diff --git a/android/x15-v2/template-cts-part3-v7a.yaml b/android/x15-v2/template-cts-part3-v7a.yaml
index 4421636..47628fa 100644
--- a/android/x15-v2/template-cts-part3-v7a.yaml
+++ b/android/x15-v2/template-cts-part3-v7a.yaml
@@ -104,6 +104,6 @@ actions:
       path: automated/android/tradefed/tradefed.yaml
       params:
         TEST_PARAMS: "run cts-part3 --abi armeabi-v7a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r4-linux_x86-arm-linaro.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r5-linux_x86-arm-linaro.zip"
         FAILURES_PRINTED: "300"
       name: cts-part3-v7a
diff --git a/android/x15-v2/template-cts-part4-v7a.yaml b/android/x15-v2/template-cts-part4-v7a.yaml
index c4eb505..6b566a4 100644
--- a/android/x15-v2/template-cts-part4-v7a.yaml
+++ b/android/x15-v2/template-cts-part4-v7a.yaml
@@ -104,6 +104,6 @@ actions:
       path: automated/android/tradefed/tradefed.yaml
       params:
         TEST_PARAMS: "run cts-part4 --abi armeabi-v7a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r4-linux_x86-arm-linaro.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r5-linux_x86-arm-linaro.zip"
         FAILURES_PRINTED: "300"
       name: cts-part4-v7a
diff --git a/android/x15-v2/template-cts-part5-v7a.yaml b/android/x15-v2/template-cts-part5-v7a.yaml
index f72b99c..408b5e5 100644
--- a/android/x15-v2/template-cts-part5-v7a.yaml
+++ b/android/x15-v2/template-cts-part5-v7a.yaml
@@ -104,6 +104,6 @@ actions:
       path: automated/android/tradefed/tradefed.yaml
       params:
         TEST_PARAMS: "run cts-part5 --abi armeabi-v7a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r4-linux_x86-arm-linaro.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/18.05/android-cts-8.1_r5-linux_x86-arm-linaro.zip"
         FAILURES_PRINTED: "300"
       name: cts-part5-v7a