update to cts version to 8.0_r2

Change-Id: I55f07983edc314c666e701b41c3bfaf8941dd80a
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
diff --git a/android/hikey-v2/template-cts-focused1-v7a.yaml b/android/hikey-v2/template-cts-focused1-v7a.yaml
index 75d9691..918f031 100644
--- a/android/hikey-v2/template-cts-focused1-v7a.yaml
+++ b/android/hikey-v2/template-cts-focused1-v7a.yaml
@@ -117,5 +117,5 @@
       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.validation.linaro.org/cts/android-cts-8.0_r1.zip"
+        TEST_URL: "http://testdata.validation.linaro.org/cts/android-cts-8.0_r2.zip"
       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 9f07dec..736a11a 100644
--- a/android/hikey-v2/template-cts-focused1-v8a.yaml
+++ b/android/hikey-v2/template-cts-focused1-v8a.yaml
@@ -117,5 +117,5 @@
       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.validation.linaro.org/cts/android-cts-8.0_r1.zip"
+        TEST_URL: "http://testdata.validation.linaro.org/cts/android-cts-8.0_r2.zip"
       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 bda8b51..f9e4b9b 100644
--- a/android/hikey-v2/template-cts-focused2-v7a.yaml
+++ b/android/hikey-v2/template-cts-focused2-v7a.yaml
@@ -117,5 +117,5 @@
       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.validation.linaro.org/cts/android-cts-8.0_r1.zip"
+        TEST_URL: "http://testdata.validation.linaro.org/cts/android-cts-8.0_r2.zip"
       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 da7710a..89d6705 100644
--- a/android/hikey-v2/template-cts-focused2-v8a.yaml
+++ b/android/hikey-v2/template-cts-focused2-v8a.yaml
@@ -117,5 +117,5 @@
       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.validation.linaro.org/cts/android-cts-8.0_r1.zip"
+        TEST_URL: "http://testdata.validation.linaro.org/cts/android-cts-8.0_r2.zip"
       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 f7aaf80..3a58588 100644
--- a/android/hikey-v2/template-cts-media-v7a.yaml
+++ b/android/hikey-v2/template-cts-media-v7a.yaml
@@ -119,5 +119,5 @@
       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.validation.linaro.org/cts/android-cts-8.0_r1.zip"
+        TEST_URL: "http://testdata.validation.linaro.org/cts/android-cts-8.0_r2.zip"
       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 74f7c4f..d3b8200 100644
--- a/android/hikey-v2/template-cts-media-v8a.yaml
+++ b/android/hikey-v2/template-cts-media-v8a.yaml
@@ -119,5 +119,5 @@
       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.validation.linaro.org/cts/android-cts-8.0_r1.zip"
+        TEST_URL: "http://testdata.validation.linaro.org/cts/android-cts-8.0_r2.zip"
       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 f05a5a7..ef738ce 100644
--- a/android/hikey-v2/template-cts-media2-v7a.yaml
+++ b/android/hikey-v2/template-cts-media2-v7a.yaml
@@ -117,5 +117,5 @@
       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.validation.linaro.org/cts/android-cts-8.0_r1.zip"
+        TEST_URL: "http://testdata.validation.linaro.org/cts/android-cts-8.0_r2.zip"
       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 df42e16..f982f39 100644
--- a/android/hikey-v2/template-cts-media2-v8a.yaml
+++ b/android/hikey-v2/template-cts-media2-v8a.yaml
@@ -117,5 +117,5 @@
       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.validation.linaro.org/cts/android-cts-8.0_r1.zip"
+        TEST_URL: "http://testdata.validation.linaro.org/cts/android-cts-8.0_r2.zip"
       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 76c5069..d859fa8 100644
--- a/android/hikey-v2/template-cts-opengl-v7a.yaml
+++ b/android/hikey-v2/template-cts-opengl-v7a.yaml
@@ -117,5 +117,5 @@
       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.validation.linaro.org/cts/android-cts-8.0_r1.zip"
+        TEST_URL: "http://testdata.validation.linaro.org/cts/android-cts-8.0_r2.zip"
       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 ed73a7f..a5b38d8 100644
--- a/android/hikey-v2/template-cts-opengl-v8a.yaml
+++ b/android/hikey-v2/template-cts-opengl-v8a.yaml
@@ -117,5 +117,5 @@
       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.validation.linaro.org/cts/android-cts-8.0_r1.zip"
+        TEST_URL: "http://testdata.validation.linaro.org/cts/android-cts-8.0_r2.zip"
       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 d0fbf36..99126e5 100644
--- a/android/hikey-v2/template-cts-part1-v7a.yaml
+++ b/android/hikey-v2/template-cts-part1-v7a.yaml
@@ -117,5 +117,5 @@
       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.validation.linaro.org/cts/android-cts-8.0_r1.zip"
+        TEST_URL: "http://testdata.validation.linaro.org/cts/android-cts-8.0_r2.zip"
       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 cf16761..86fb4c3 100644
--- a/android/hikey-v2/template-cts-part1-v8a.yaml
+++ b/android/hikey-v2/template-cts-part1-v8a.yaml
@@ -117,5 +117,5 @@
       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.validation.linaro.org/cts/android-cts-8.0_r1.zip"
+        TEST_URL: "http://testdata.validation.linaro.org/cts/android-cts-8.0_r2.zip"
       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 dcc5608..795545d 100644
--- a/android/hikey-v2/template-cts-part2-v7a.yaml
+++ b/android/hikey-v2/template-cts-part2-v7a.yaml
@@ -119,5 +119,5 @@
       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.validation.linaro.org/cts/android-cts-8.0_r1.zip"
+        TEST_URL: "http://testdata.validation.linaro.org/cts/android-cts-8.0_r2.zip"
       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 f0dc0b2..a226bea 100644
--- a/android/hikey-v2/template-cts-part2-v8a.yaml
+++ b/android/hikey-v2/template-cts-part2-v8a.yaml
@@ -119,5 +119,5 @@
       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.validation.linaro.org/cts/android-cts-8.0_r1.zip"
+        TEST_URL: "http://testdata.validation.linaro.org/cts/android-cts-8.0_r2.zip"
       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 f8f03dd..ae17caf 100644
--- a/android/hikey-v2/template-cts-part3-v7a.yaml
+++ b/android/hikey-v2/template-cts-part3-v7a.yaml
@@ -117,5 +117,5 @@
       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.validation.linaro.org/cts/android-cts-8.0_r1.zip"
+        TEST_URL: "http://testdata.validation.linaro.org/cts/android-cts-8.0_r2.zip"
       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 39d35e0..8612e74 100644
--- a/android/hikey-v2/template-cts-part3-v8a.yaml
+++ b/android/hikey-v2/template-cts-part3-v8a.yaml
@@ -117,5 +117,5 @@
       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.validation.linaro.org/cts/android-cts-8.0_r1.zip"
+        TEST_URL: "http://testdata.validation.linaro.org/cts/android-cts-8.0_r2.zip"
       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 0671f2f..8f654fd 100644
--- a/android/hikey-v2/template-cts-part4-v7a.yaml
+++ b/android/hikey-v2/template-cts-part4-v7a.yaml
@@ -117,5 +117,5 @@
       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.validation.linaro.org/cts/android-cts-8.0_r1.zip"
+        TEST_URL: "http://testdata.validation.linaro.org/cts/android-cts-8.0_r2.zip"
       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 d7a700f..d089fdb 100644
--- a/android/hikey-v2/template-cts-part4-v8a.yaml
+++ b/android/hikey-v2/template-cts-part4-v8a.yaml
@@ -117,5 +117,5 @@
       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.validation.linaro.org/cts/android-cts-8.0_r1.zip"
+        TEST_URL: "http://testdata.validation.linaro.org/cts/android-cts-8.0_r2.zip"
       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 857928b..83783de 100644
--- a/android/hikey-v2/template-cts-part5-v7a.yaml
+++ b/android/hikey-v2/template-cts-part5-v7a.yaml
@@ -117,5 +117,5 @@
       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.validation.linaro.org/cts/android-cts-8.0_r1.zip"
+        TEST_URL: "http://testdata.validation.linaro.org/cts/android-cts-8.0_r2.zip"
       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 13cbafa..295f945 100644
--- a/android/hikey-v2/template-cts-part5-v8a.yaml
+++ b/android/hikey-v2/template-cts-part5-v8a.yaml
@@ -117,5 +117,5 @@
       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.validation.linaro.org/cts/android-cts-8.0_r1.zip"
+        TEST_URL: "http://testdata.validation.linaro.org/cts/android-cts-8.0_r2.zip"
       name: cts-part5-v8a