android hikey & x15 cts and vts package url: update to use http://testdata.linaro.org

since all the files in http://testdata.validation.linaro.org
had been moved to http://testdata.linaro.org

according to the tickted here:
https://projects.linaro.org/browse/CTT-775

Change-Id: I3b95b3f7d448739c519f0dd6b839de8683573ba3
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 e367800..8492714 100644
--- a/android/hikey-v2/template-cts-focused1-v7a.yaml
+++ b/android/hikey-v2/template-cts-focused1-v7a.yaml
@@ -126,6 +126,6 @@
       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.1_r3.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/android-cts-8.1_r3.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 cbdef55..af65209 100644
--- a/android/hikey-v2/template-cts-focused1-v8a.yaml
+++ b/android/hikey-v2/template-cts-focused1-v8a.yaml
@@ -126,6 +126,6 @@
       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.1_r3.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/android-cts-8.1_r3.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 c47351d..f244306 100644
--- a/android/hikey-v2/template-cts-focused2-v7a.yaml
+++ b/android/hikey-v2/template-cts-focused2-v7a.yaml
@@ -126,6 +126,6 @@
       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.1_r3.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/android-cts-8.1_r3.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 ab51de0..6bf4ff3 100644
--- a/android/hikey-v2/template-cts-focused2-v8a.yaml
+++ b/android/hikey-v2/template-cts-focused2-v8a.yaml
@@ -126,6 +126,6 @@
       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.1_r3.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/android-cts-8.1_r3.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 5ee159b..cb94044 100644
--- a/android/hikey-v2/template-cts-media-v7a.yaml
+++ b/android/hikey-v2/template-cts-media-v7a.yaml
@@ -128,6 +128,6 @@
       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.1_r3.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/android-cts-8.1_r3.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 c2aeba0..ebf02f3 100644
--- a/android/hikey-v2/template-cts-media-v8a.yaml
+++ b/android/hikey-v2/template-cts-media-v8a.yaml
@@ -128,6 +128,6 @@
       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.1_r3.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/android-cts-8.1_r3.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 f224f05..4108645 100644
--- a/android/hikey-v2/template-cts-media2-v7a.yaml
+++ b/android/hikey-v2/template-cts-media2-v7a.yaml
@@ -126,6 +126,6 @@
       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.1_r3.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/android-cts-8.1_r3.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 7dcae46..8c9f2a9 100644
--- a/android/hikey-v2/template-cts-media2-v8a.yaml
+++ b/android/hikey-v2/template-cts-media2-v8a.yaml
@@ -126,6 +126,6 @@
       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.1_r3.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/android-cts-8.1_r3.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 47ffdab..3aaa154 100644
--- a/android/hikey-v2/template-cts-opengl-v7a.yaml
+++ b/android/hikey-v2/template-cts-opengl-v7a.yaml
@@ -126,6 +126,6 @@
       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.1_r3.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/android-cts-8.1_r3.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 7232331..f011050 100644
--- a/android/hikey-v2/template-cts-opengl-v8a.yaml
+++ b/android/hikey-v2/template-cts-opengl-v8a.yaml
@@ -126,6 +126,6 @@
       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.1_r3.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/android-cts-8.1_r3.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 2f1842f..5965d99 100644
--- a/android/hikey-v2/template-cts-part1-v7a.yaml
+++ b/android/hikey-v2/template-cts-part1-v7a.yaml
@@ -126,6 +126,6 @@
       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.1_r3.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/android-cts-8.1_r3.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 a38eb2d..559bdd0 100644
--- a/android/hikey-v2/template-cts-part1-v8a.yaml
+++ b/android/hikey-v2/template-cts-part1-v8a.yaml
@@ -126,6 +126,6 @@
       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.1_r3.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/android-cts-8.1_r3.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 57fea15..243f4b8 100644
--- a/android/hikey-v2/template-cts-part2-v7a.yaml
+++ b/android/hikey-v2/template-cts-part2-v7a.yaml
@@ -128,6 +128,6 @@
       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.1_r3.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/android-cts-8.1_r3.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 1c81af2..bc09aeb 100644
--- a/android/hikey-v2/template-cts-part2-v8a.yaml
+++ b/android/hikey-v2/template-cts-part2-v8a.yaml
@@ -128,6 +128,6 @@
       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.1_r3.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/android-cts-8.1_r3.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 d48b59a..646e1d4 100644
--- a/android/hikey-v2/template-cts-part3-v7a.yaml
+++ b/android/hikey-v2/template-cts-part3-v7a.yaml
@@ -126,6 +126,6 @@
       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.1_r3.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/android-cts-8.1_r3.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 55ca360..a2fe350 100644
--- a/android/hikey-v2/template-cts-part3-v8a.yaml
+++ b/android/hikey-v2/template-cts-part3-v8a.yaml
@@ -126,6 +126,6 @@
       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.1_r3.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/android-cts-8.1_r3.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 193d89c..5de5a30 100644
--- a/android/hikey-v2/template-cts-part4-v7a.yaml
+++ b/android/hikey-v2/template-cts-part4-v7a.yaml
@@ -126,6 +126,6 @@
       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.1_r3.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/android-cts-8.1_r3.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 3185929..5900ca6 100644
--- a/android/hikey-v2/template-cts-part4-v8a.yaml
+++ b/android/hikey-v2/template-cts-part4-v8a.yaml
@@ -126,6 +126,6 @@
       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.1_r3.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/android-cts-8.1_r3.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 97a9a63..2a7caae 100644
--- a/android/hikey-v2/template-cts-part5-v7a.yaml
+++ b/android/hikey-v2/template-cts-part5-v7a.yaml
@@ -126,6 +126,6 @@
       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.1_r3.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/android-cts-8.1_r3.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 273593a..47bdda0 100644
--- a/android/hikey-v2/template-cts-part5-v8a.yaml
+++ b/android/hikey-v2/template-cts-part5-v8a.yaml
@@ -126,6 +126,6 @@
       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.1_r3.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/android-cts-8.1_r3.zip"
         FAILURES_PRINTED: "300"
       name: cts-part5-v8a
diff --git a/android/hikey-v2/template-vts-part1.yaml b/android/hikey-v2/template-vts-part1.yaml
index 52fbe9b..9e88c23 100644
--- a/android/hikey-v2/template-vts-part1.yaml
+++ b/android/hikey-v2/template-vts-part1.yaml
@@ -121,7 +121,7 @@
           from: git
           path: automated/android/tradefed/tradefed.yaml
           params:
-                TEST_URL: "http://testdata.validation.linaro.org/vts/oreo-mr1-vts-release-02152018/android-vts.zip"
+                TEST_URL: "http://testdata.linaro.org/vts/oreo-mr1-vts-release-02152018/android-vts.zip"
                 TEST_PARAMS: "run vts-kernel --exclude-filter VtsKernelLinuxKselftest --exclude-filter VtsKernelLtp --skip-device-info"
                 TEST_PATH: "android-vts"
                 RESULTS_FORMAT: "atomic"
diff --git a/android/hikey-v2/template-vts-part2.yaml b/android/hikey-v2/template-vts-part2.yaml
index 3e5d4e0..c9c8010 100644
--- a/android/hikey-v2/template-vts-part2.yaml
+++ b/android/hikey-v2/template-vts-part2.yaml
@@ -121,7 +121,7 @@
           from: git
           path: automated/android/tradefed/tradefed.yaml
           params:
-                TEST_URL: "http://testdata.validation.linaro.org/vts/oreo-mr1-vts-release-02152018/android-vts.zip"
+                TEST_URL: "http://testdata.linaro.org/vts/oreo-mr1-vts-release-02152018/android-vts.zip"
                 TEST_PARAMS: "run vts-kernel --module VtsKernelLinuxKselftest --skip-device-info"
                 TEST_PATH: "android-vts"
                 RESULTS_FORMAT: "atomic"
diff --git a/android/hikey-v2/template-vts-part3.yaml b/android/hikey-v2/template-vts-part3.yaml
index 71b90c9..04e5844 100644
--- a/android/hikey-v2/template-vts-part3.yaml
+++ b/android/hikey-v2/template-vts-part3.yaml
@@ -121,7 +121,7 @@
           from: git
           path: automated/android/tradefed/tradefed.yaml
           params:
-                TEST_URL: "http://testdata.validation.linaro.org/vts/oreo-mr1-vts-release-02152018/android-vts.zip"
+                TEST_URL: "http://testdata.linaro.org/vts/oreo-mr1-vts-release-02152018/android-vts.zip"
                 TEST_PARAMS: "run vts-kernel --module VtsKernelLtp --skip-device-info"
                 TEST_PATH: "android-vts"
                 RESULTS_FORMAT: "atomic"
diff --git a/android/hikey-v2/template-vts-part4.yaml b/android/hikey-v2/template-vts-part4.yaml
index 17bfdd9..68f9b9c 100644
--- a/android/hikey-v2/template-vts-part4.yaml
+++ b/android/hikey-v2/template-vts-part4.yaml
@@ -121,7 +121,7 @@
           from: git
           path: automated/android/tradefed/tradefed.yaml
           params:
-                TEST_URL: "http://testdata.validation.linaro.org/vts/oreo-mr1-vts-release-02152018/android-vts.zip"
+                TEST_URL: "http://testdata.linaro.org/vts/oreo-mr1-vts-release-02152018/android-vts.zip"
                 TEST_PARAMS: "run vts-library --skip-device-info"
                 TEST_PATH: "android-vts"
                 RESULTS_FORMAT: "atomic"
diff --git a/android/hikey-v2/template-vts-part5.yaml b/android/hikey-v2/template-vts-part5.yaml
index 49c19bd..1b2ec7f 100644
--- a/android/hikey-v2/template-vts-part5.yaml
+++ b/android/hikey-v2/template-vts-part5.yaml
@@ -121,7 +121,7 @@
           from: git
           path: automated/android/tradefed/tradefed.yaml
           params:
-                TEST_URL: "http://testdata.validation.linaro.org/vts/oreo-mr1-vts-release-02152018/android-vts.zip"
+                TEST_URL: "http://testdata.linaro.org/vts/oreo-mr1-vts-release-02152018/android-vts.zip"
                 TEST_PARAMS: "run vts-performance --skip-device-info"
                 TEST_PATH: "android-vts"
                 RESULTS_FORMAT: "atomic"
diff --git a/android/hikey-v2/template-vts-part6.yaml b/android/hikey-v2/template-vts-part6.yaml
index 6abaec1..fc9a027 100644
--- a/android/hikey-v2/template-vts-part6.yaml
+++ b/android/hikey-v2/template-vts-part6.yaml
@@ -121,7 +121,7 @@
           from: git
           path: automated/android/tradefed/tradefed.yaml
           params:
-                TEST_URL: "http://testdata.validation.linaro.org/vts/oreo-mr1-vts-release-02152018/android-vts.zip"
+                TEST_URL: "http://testdata.linaro.org/vts/oreo-mr1-vts-release-02152018/android-vts.zip"
                 TEST_PARAMS: "run vts-hal --skip-device-info"
                 TEST_PATH: "android-vts"
                 RESULTS_FORMAT: "atomic"
diff --git a/android/x15-v2/template-cts-focused1-v7a.yaml b/android/x15-v2/template-cts-focused1-v7a.yaml
index 7b529b6..4fe797e 100644
--- a/android/x15-v2/template-cts-focused1-v7a.yaml
+++ b/android/x15-v2/template-cts-focused1-v7a.yaml
@@ -106,6 +106,6 @@
       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.1_r3.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/android-cts-8.1_r3.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 04de48a..88de013 100644
--- a/android/x15-v2/template-cts-focused2-v7a.yaml
+++ b/android/x15-v2/template-cts-focused2-v7a.yaml
@@ -106,6 +106,6 @@
       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.1_r3.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/android-cts-8.1_r3.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 094bc3a..29fb41d 100644
--- a/android/x15-v2/template-cts-media-v7a.yaml
+++ b/android/x15-v2/template-cts-media-v7a.yaml
@@ -108,6 +108,6 @@
       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.1_r3.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/android-cts-8.1_r3.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 5e9014e..be34d9d 100644
--- a/android/x15-v2/template-cts-media2-v7a.yaml
+++ b/android/x15-v2/template-cts-media2-v7a.yaml
@@ -106,6 +106,6 @@
       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.1_r3.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/android-cts-8.1_r3.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 1a8fbd5..7aecff1 100644
--- a/android/x15-v2/template-cts-opengl-v7a.yaml
+++ b/android/x15-v2/template-cts-opengl-v7a.yaml
@@ -106,6 +106,6 @@
       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.1_r3.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/android-cts-8.1_r3.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 bee5454..431019d 100644
--- a/android/x15-v2/template-cts-part1-v7a.yaml
+++ b/android/x15-v2/template-cts-part1-v7a.yaml
@@ -106,6 +106,6 @@
       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.1_r3.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/android-cts-8.1_r3.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 f1ab868..5da1989 100644
--- a/android/x15-v2/template-cts-part2-v7a.yaml
+++ b/android/x15-v2/template-cts-part2-v7a.yaml
@@ -108,6 +108,6 @@
       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.1_r3.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/android-cts-8.1_r3.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 60f22f3..99451a9 100644
--- a/android/x15-v2/template-cts-part3-v7a.yaml
+++ b/android/x15-v2/template-cts-part3-v7a.yaml
@@ -106,6 +106,6 @@
       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.1_r3.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/android-cts-8.1_r3.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 9b88b84..9cb0eff 100644
--- a/android/x15-v2/template-cts-part4-v7a.yaml
+++ b/android/x15-v2/template-cts-part4-v7a.yaml
@@ -106,6 +106,6 @@
       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.1_r3.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/android-cts-8.1_r3.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 fbe2f9c..aa63dba 100644
--- a/android/x15-v2/template-cts-part5-v7a.yaml
+++ b/android/x15-v2/template-cts-part5-v7a.yaml
@@ -106,6 +106,6 @@
       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.1_r3.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/android-cts-8.1_r3.zip"
         FAILURES_PRINTED: "300"
       name: cts-part5-v7a
diff --git a/android/x15-v2/template-vts-part1.yaml b/android/x15-v2/template-vts-part1.yaml
index 61f1cc5..ede1a8c 100644
--- a/android/x15-v2/template-vts-part1.yaml
+++ b/android/x15-v2/template-vts-part1.yaml
@@ -105,7 +105,7 @@
           from: git
           path: automated/android/tradefed/tradefed.yaml
           params:
-                TEST_URL: "http://testdata.validation.linaro.org/vts/oreo-mr1-vts-release-02152018/android-vts.zip"
+                TEST_URL: "http://testdata.linaro.org/vts/oreo-mr1-vts-release-02152018/android-vts.zip"
                 TEST_PARAMS: "run vts-kernel --exclude-filter VtsKernelLinuxKselftest --exclude-filter VtsKernelLtp --skip-device-info"
                 TEST_PATH: "android-vts"
                 RESULTS_FORMAT: "atomic"
diff --git a/android/x15-v2/template-vts-part2.yaml b/android/x15-v2/template-vts-part2.yaml
index db090b6..f0dd251 100644
--- a/android/x15-v2/template-vts-part2.yaml
+++ b/android/x15-v2/template-vts-part2.yaml
@@ -105,7 +105,7 @@
           from: git
           path: automated/android/tradefed/tradefed.yaml
           params:
-                TEST_URL: "http://testdata.validation.linaro.org/vts/oreo-mr1-vts-release-02152018/android-vts.zip"
+                TEST_URL: "http://testdata.linaro.org/vts/oreo-mr1-vts-release-02152018/android-vts.zip"
                 TEST_PARAMS: "run vts-kernel --module VtsKernelLinuxKselftest --skip-device-info"
                 TEST_PATH: "android-vts"
                 RESULTS_FORMAT: "atomic"
diff --git a/android/x15-v2/template-vts-part3.yaml b/android/x15-v2/template-vts-part3.yaml
index 62197e2..e465116 100644
--- a/android/x15-v2/template-vts-part3.yaml
+++ b/android/x15-v2/template-vts-part3.yaml
@@ -105,7 +105,7 @@
           from: git
           path: automated/android/tradefed/tradefed.yaml
           params:
-                TEST_URL: "http://testdata.validation.linaro.org/vts/oreo-mr1-vts-release-02152018/android-vts.zip"
+                TEST_URL: "http://testdata.linaro.org/vts/oreo-mr1-vts-release-02152018/android-vts.zip"
                 TEST_PARAMS: "run vts-kernel --module VtsKernelLtp --skip-device-info"
                 TEST_PATH: "android-vts"
                 RESULTS_FORMAT: "atomic"
diff --git a/android/x15-v2/template-vts-part4.yaml b/android/x15-v2/template-vts-part4.yaml
index a618917..b5cdd1d 100644
--- a/android/x15-v2/template-vts-part4.yaml
+++ b/android/x15-v2/template-vts-part4.yaml
@@ -105,7 +105,7 @@
           from: git
           path: automated/android/tradefed/tradefed.yaml
           params:
-                TEST_URL: "http://testdata.validation.linaro.org/vts/oreo-mr1-vts-release-02152018/android-vts.zip"
+                TEST_URL: "http://testdata.linaro.org/vts/oreo-mr1-vts-release-02152018/android-vts.zip"
                 TEST_PARAMS: "run vts-library --skip-device-info"
                 TEST_PATH: "android-vts"
                 RESULTS_FORMAT: "atomic"
diff --git a/android/x15-v2/template-vts-part5.yaml b/android/x15-v2/template-vts-part5.yaml
index 6779925..5b2cc4e 100644
--- a/android/x15-v2/template-vts-part5.yaml
+++ b/android/x15-v2/template-vts-part5.yaml
@@ -105,7 +105,7 @@
           from: git
           path: automated/android/tradefed/tradefed.yaml
           params:
-                TEST_URL: "http://testdata.validation.linaro.org/vts/oreo-mr1-vts-release-02152018/android-vts.zip"
+                TEST_URL: "http://testdata.linaro.org/vts/oreo-mr1-vts-release-02152018/android-vts.zip"
                 TEST_PARAMS: "run vts-performance --skip-device-info"
                 TEST_PATH: "android-vts"
                 RESULTS_FORMAT: "atomic"
diff --git a/android/x15-v2/template-vts-part6.yaml b/android/x15-v2/template-vts-part6.yaml
index 3b04091..52a45d0 100644
--- a/android/x15-v2/template-vts-part6.yaml
+++ b/android/x15-v2/template-vts-part6.yaml
@@ -105,7 +105,7 @@
           from: git
           path: automated/android/tradefed/tradefed.yaml
           params:
-                TEST_URL: "http://testdata.validation.linaro.org/vts/oreo-mr1-vts-release-02152018/android-vts.zip"
+                TEST_URL: "http://testdata.linaro.org/vts/oreo-mr1-vts-release-02152018/android-vts.zip"
                 TEST_PARAMS: "run vts-hal --skip-device-info"
                 TEST_PATH: "android-vts"
                 RESULTS_FORMAT: "atomic"