update to cts version to 7.1_r7

Change-Id: I693afe2873eed5938fabcb8e6ede65dd62adb5ae
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
diff --git a/android/hikey/template-cts-focused1.json b/android/hikey/template-cts-focused1.json
index 2fb2659..dcf6530 100644
--- a/android/hikey/template-cts-focused1.json
+++ b/android/hikey/template-cts-focused1.json
@@ -64,7 +64,7 @@
                         "git-repo": "https://git.linaro.org/qa/test-definitions.git",
                         "testdef": "android/cts-host.yaml",
                         "parameters": {
-                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r6.zip",
+                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r7.zip",
                             "JDK": "openjdk-8-jdk-headless",
                             "JRE": "openjdk-8-jre-headless",
                             "DEPENDENCIES": "wget adb xz-utils python-lxml python-setuptools python-pexpect zip lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libncurses5:i386 libstdc++6:i386",
diff --git a/android/hikey/template-cts-focused2.json b/android/hikey/template-cts-focused2.json
index 08f0ad4..3780f92 100644
--- a/android/hikey/template-cts-focused2.json
+++ b/android/hikey/template-cts-focused2.json
@@ -64,7 +64,7 @@
                         "git-repo": "https://git.linaro.org/qa/test-definitions.git",
                         "testdef": "android/cts-host.yaml",
                         "parameters": {
-                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r6.zip",
+                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r7.zip",
                             "JDK": "openjdk-8-jdk-headless",
                             "JRE": "openjdk-8-jre-headless",
                             "DEPENDENCIES": "wget adb xz-utils python-lxml python-setuptools python-pexpect zip lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libncurses5:i386 libstdc++6:i386",
diff --git a/android/hikey/template-cts-media-32.json b/android/hikey/template-cts-media-32.json
index ca617c5..4dd5298 100644
--- a/android/hikey/template-cts-media-32.json
+++ b/android/hikey/template-cts-media-32.json
@@ -64,7 +64,7 @@
                         "git-repo": "https://git.linaro.org/qa/test-definitions.git",
                         "testdef": "android/cts-host.yaml",
                         "parameters": {
-                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r6.zip",
+                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r7.zip",
                             "JDK": "openjdk-8-jdk-headless",
                             "JRE": "openjdk-8-jre-headless",
                             "DEPENDENCIES": "wget adb xz-utils python-lxml python-setuptools python-pexpect zip lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libncurses5:i386 libstdc++6:i386",
diff --git a/android/hikey/template-cts-media-64.json b/android/hikey/template-cts-media-64.json
index 4b0ece3..00a12bc 100644
--- a/android/hikey/template-cts-media-64.json
+++ b/android/hikey/template-cts-media-64.json
@@ -64,7 +64,7 @@
                         "git-repo": "https://git.linaro.org/qa/test-definitions.git",
                         "testdef": "android/cts-host.yaml",
                         "parameters": {
-                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r6.zip",
+                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r7.zip",
                             "JDK": "openjdk-8-jdk-headless",
                             "JRE": "openjdk-8-jre-headless",
                             "DEPENDENCIES": "wget adb xz-utils python-lxml python-setuptools python-pexpect zip lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libncurses5:i386 libstdc++6:i386",
diff --git a/android/hikey/template-cts-opengl.json b/android/hikey/template-cts-opengl.json
index 9873796..395f16f 100644
--- a/android/hikey/template-cts-opengl.json
+++ b/android/hikey/template-cts-opengl.json
@@ -64,7 +64,7 @@
                         "git-repo": "https://git.linaro.org/qa/test-definitions.git",
                         "testdef": "android/cts-host.yaml",
                         "parameters": {
-                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r6.zip",
+                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r7.zip",
                             "JDK": "openjdk-8-jdk-headless",
                             "JRE": "openjdk-8-jre-headless",
                             "DEPENDENCIES": "wget adb xz-utils python-lxml python-setuptools python-pexpect zip lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libncurses5:i386 libstdc++6:i386",
diff --git a/android/hikey/template-cts-part1.json b/android/hikey/template-cts-part1.json
index 890ef29..0407b30 100644
--- a/android/hikey/template-cts-part1.json
+++ b/android/hikey/template-cts-part1.json
@@ -64,7 +64,7 @@
                         "git-repo": "https://git.linaro.org/qa/test-definitions.git",
                         "testdef": "android/cts-host.yaml",
                         "parameters": {
-                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r6.zip",
+                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r7.zip",
                             "JDK": "openjdk-8-jdk-headless",
                             "JRE": "openjdk-8-jre-headless",
                             "DEPENDENCIES": "wget adb xz-utils python-lxml python-setuptools python-pexpect zip lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libncurses5:i386 libstdc++6:i386",
diff --git a/android/hikey/template-cts-part2-32.json b/android/hikey/template-cts-part2-32.json
index b0b85eb..1786e3c 100644
--- a/android/hikey/template-cts-part2-32.json
+++ b/android/hikey/template-cts-part2-32.json
@@ -64,7 +64,7 @@
                         "git-repo": "https://git.linaro.org/qa/test-definitions.git",
                         "testdef": "android/cts-host.yaml",
                         "parameters": {
-                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r6.zip",
+                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r7.zip",
                             "JDK": "openjdk-8-jdk-headless",
                             "JRE": "openjdk-8-jre-headless",
                             "DEPENDENCIES": "wget adb xz-utils python-lxml python-setuptools python-pexpect zip lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libncurses5:i386 libstdc++6:i386",
diff --git a/android/hikey/template-cts-part2-64.json b/android/hikey/template-cts-part2-64.json
index 8d7b8e0..5f56914 100644
--- a/android/hikey/template-cts-part2-64.json
+++ b/android/hikey/template-cts-part2-64.json
@@ -64,7 +64,7 @@
                         "git-repo": "https://git.linaro.org/qa/test-definitions.git",
                         "testdef": "android/cts-host.yaml",
                         "parameters": {
-                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r6.zip",
+                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r7.zip",
                             "JDK": "openjdk-8-jdk-headless",
                             "JRE": "openjdk-8-jre-headless",
                             "DEPENDENCIES": "wget adb xz-utils python-lxml python-setuptools python-pexpect zip lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libncurses5:i386 libstdc++6:i386",
diff --git a/android/hikey/template-cts-part3.json b/android/hikey/template-cts-part3.json
index 078874c..c8750fc 100644
--- a/android/hikey/template-cts-part3.json
+++ b/android/hikey/template-cts-part3.json
@@ -64,7 +64,7 @@
                         "git-repo": "https://git.linaro.org/qa/test-definitions.git",
                         "testdef": "android/cts-host.yaml",
                         "parameters": {
-                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r6.zip",
+                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r7.zip",
                             "JDK": "openjdk-8-jdk-headless",
                             "JRE": "openjdk-8-jre-headless",
                             "DEPENDENCIES": "wget adb xz-utils python-lxml python-setuptools python-pexpect zip lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libncurses5:i386 libstdc++6:i386",
diff --git a/android/hikey/template-cts-part4.json b/android/hikey/template-cts-part4.json
index 2697ec6..5c56e88 100644
--- a/android/hikey/template-cts-part4.json
+++ b/android/hikey/template-cts-part4.json
@@ -64,7 +64,7 @@
                         "git-repo": "https://git.linaro.org/qa/test-definitions.git",
                         "testdef": "android/cts-host.yaml",
                         "parameters": {
-                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r6.zip",
+                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r7.zip",
                             "JDK": "openjdk-8-jdk-headless",
                             "JRE": "openjdk-8-jre-headless",
                             "DEPENDENCIES": "wget adb xz-utils python-lxml python-setuptools python-pexpect zip lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libncurses5:i386 libstdc++6:i386",
diff --git a/android/lcr-member-juno-m/template-cts-focused1.json b/android/lcr-member-juno-m/template-cts-focused1.json
index bc33406..d3d52f0 100644
--- a/android/lcr-member-juno-m/template-cts-focused1.json
+++ b/android/lcr-member-juno-m/template-cts-focused1.json
@@ -56,7 +56,7 @@
                         "git-repo": "https://git.linaro.org/qa/test-definitions.git",
                         "testdef": "android/cts-host.yaml",
                         "parameters": {
-                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r6.zip",
+                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r7.zip",
                             "JDK": "openjdk-8-jdk-headless",
                             "JRE": "openjdk-8-jre-headless",
                             "DEPENDENCIES": "wget adb xz-utils python-lxml python-setuptools python-pexpect zip lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libncurses5:i386 libstdc++6:i386",
diff --git a/android/lcr-member-juno-m/template-cts-focused2.json b/android/lcr-member-juno-m/template-cts-focused2.json
index 855ef41..424cefb 100644
--- a/android/lcr-member-juno-m/template-cts-focused2.json
+++ b/android/lcr-member-juno-m/template-cts-focused2.json
@@ -56,7 +56,7 @@
                         "git-repo": "https://git.linaro.org/qa/test-definitions.git",
                         "testdef": "android/cts-host.yaml",
                         "parameters": {
-                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r6.zip",
+                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r7.zip",
                             "JDK": "openjdk-8-jdk-headless",
                             "JRE": "openjdk-8-jre-headless",
                             "DEPENDENCIES": "wget adb xz-utils python-lxml python-setuptools python-pexpect zip lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libncurses5:i386 libstdc++6:i386",
diff --git a/android/lcr-member-juno-m/template-cts-media-32.json b/android/lcr-member-juno-m/template-cts-media-32.json
index 11ecd46..1c9c374 100644
--- a/android/lcr-member-juno-m/template-cts-media-32.json
+++ b/android/lcr-member-juno-m/template-cts-media-32.json
@@ -56,7 +56,7 @@
                         "git-repo": "https://git.linaro.org/qa/test-definitions.git",
                         "testdef": "android/cts-host.yaml",
                         "parameters": {
-                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r6.zip",
+                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r7.zip",
                             "JDK": "openjdk-8-jdk-headless",
                             "JRE": "openjdk-8-jre-headless",
                             "DEPENDENCIES": "wget adb xz-utils python-lxml python-setuptools python-pexpect zip lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libncurses5:i386 libstdc++6:i386",
diff --git a/android/lcr-member-juno-m/template-cts-media-64.json b/android/lcr-member-juno-m/template-cts-media-64.json
index d074bbb..041cc88 100644
--- a/android/lcr-member-juno-m/template-cts-media-64.json
+++ b/android/lcr-member-juno-m/template-cts-media-64.json
@@ -56,7 +56,7 @@
                         "git-repo": "https://git.linaro.org/qa/test-definitions.git",
                         "testdef": "android/cts-host.yaml",
                         "parameters": {
-                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r6.zip",
+                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r7.zip",
                             "JDK": "openjdk-8-jdk-headless",
                             "JRE": "openjdk-8-jre-headless",
                             "DEPENDENCIES": "wget adb xz-utils python-lxml python-setuptools python-pexpect zip lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libncurses5:i386 libstdc++6:i386",
diff --git a/android/lcr-member-juno-m/template-cts-opengl-32.json b/android/lcr-member-juno-m/template-cts-opengl-32.json
index b363d4a..8dbb943 100644
--- a/android/lcr-member-juno-m/template-cts-opengl-32.json
+++ b/android/lcr-member-juno-m/template-cts-opengl-32.json
@@ -56,7 +56,7 @@
                         "git-repo": "https://git.linaro.org/qa/test-definitions.git",
                         "testdef": "android/cts-host.yaml",
                         "parameters": {
-                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r6.zip",
+                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r7.zip",
                             "JDK": "openjdk-8-jdk-headless",
                             "JRE": "openjdk-8-jre-headless",
                             "DEPENDENCIES": "wget adb xz-utils python-lxml python-setuptools python-pexpect zip lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libncurses5:i386 libstdc++6:i386",
diff --git a/android/lcr-member-juno-m/template-cts-opengl-64.json b/android/lcr-member-juno-m/template-cts-opengl-64.json
index c3c1144..90d382d 100644
--- a/android/lcr-member-juno-m/template-cts-opengl-64.json
+++ b/android/lcr-member-juno-m/template-cts-opengl-64.json
@@ -56,7 +56,7 @@
                         "git-repo": "https://git.linaro.org/qa/test-definitions.git",
                         "testdef": "android/cts-host.yaml",
                         "parameters": {
-                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r6.zip",
+                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r7.zip",
                             "JDK": "openjdk-8-jdk-headless",
                             "JRE": "openjdk-8-jre-headless",
                             "DEPENDENCIES": "wget adb xz-utils python-lxml python-setuptools python-pexpect zip lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libncurses5:i386 libstdc++6:i386",
diff --git a/android/lcr-member-juno-m/template-cts-part1.json b/android/lcr-member-juno-m/template-cts-part1.json
index 98c3b3f..b80b16d 100644
--- a/android/lcr-member-juno-m/template-cts-part1.json
+++ b/android/lcr-member-juno-m/template-cts-part1.json
@@ -56,7 +56,7 @@
                         "git-repo": "https://git.linaro.org/qa/test-definitions.git",
                         "testdef": "android/cts-host.yaml",
                         "parameters": {
-                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r6.zip",
+                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r7.zip",
                             "JDK": "openjdk-8-jdk-headless",
                             "JRE": "openjdk-8-jre-headless",
                             "DEPENDENCIES": "wget adb xz-utils python-lxml python-setuptools python-pexpect zip lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libncurses5:i386 libstdc++6:i386",
diff --git a/android/lcr-member-juno-m/template-cts-part2.json b/android/lcr-member-juno-m/template-cts-part2.json
index 935c219..71f0756 100644
--- a/android/lcr-member-juno-m/template-cts-part2.json
+++ b/android/lcr-member-juno-m/template-cts-part2.json
@@ -56,7 +56,7 @@
                         "git-repo": "https://git.linaro.org/qa/test-definitions.git",
                         "testdef": "android/cts-host.yaml",
                         "parameters": {
-                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r6.zip",
+                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r7.zip",
                             "JDK": "openjdk-8-jdk-headless",
                             "JRE": "openjdk-8-jre-headless",
                             "DEPENDENCIES": "wget adb xz-utils python-lxml python-setuptools python-pexpect zip lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libncurses5:i386 libstdc++6:i386",
diff --git a/android/lcr-member-juno-m/template-cts-part3.json b/android/lcr-member-juno-m/template-cts-part3.json
index b02b06d..92c2499 100644
--- a/android/lcr-member-juno-m/template-cts-part3.json
+++ b/android/lcr-member-juno-m/template-cts-part3.json
@@ -56,7 +56,7 @@
                         "git-repo": "https://git.linaro.org/qa/test-definitions.git",
                         "testdef": "android/cts-host.yaml",
                         "parameters": {
-                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r6.zip",
+                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r7.zip",
                             "JDK": "openjdk-8-jdk-headless",
                             "JRE": "openjdk-8-jre-headless",
                             "DEPENDENCIES": "wget adb xz-utils python-lxml python-setuptools python-pexpect zip lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libncurses5:i386 libstdc++6:i386",
diff --git a/android/lcr-member-juno-m/template-cts-part4.json b/android/lcr-member-juno-m/template-cts-part4.json
index f406e0e..5789c0e 100644
--- a/android/lcr-member-juno-m/template-cts-part4.json
+++ b/android/lcr-member-juno-m/template-cts-part4.json
@@ -56,7 +56,7 @@
                         "git-repo": "https://git.linaro.org/qa/test-definitions.git",
                         "testdef": "android/cts-host.yaml",
                         "parameters": {
-                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r6.zip",
+                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r7.zip",
                             "JDK": "openjdk-8-jdk-headless",
                             "JRE": "openjdk-8-jre-headless",
                             "DEPENDENCIES": "wget adb xz-utils python-lxml python-setuptools python-pexpect zip lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libncurses5:i386 libstdc++6:i386",
diff --git a/android/x15/template-cts-focused1.json b/android/x15/template-cts-focused1.json
index 941c68f..a74b129 100644
--- a/android/x15/template-cts-focused1.json
+++ b/android/x15/template-cts-focused1.json
@@ -72,7 +72,7 @@
                         "git-repo": "https://git.linaro.org/qa/test-definitions.git",
                         "testdef": "android/cts-host.yaml",
                         "parameters": {
-                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r6.zip",
+                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r7.zip",
                             "JDK": "openjdk-8-jdk-headless",
                             "JRE": "openjdk-8-jre-headless",
                             "DEPENDENCIES": "wget adb xz-utils python-lxml python-setuptools python-pexpect zip lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libncurses5:i386 libstdc++6:i386",
diff --git a/android/x15/template-cts-focused2.json b/android/x15/template-cts-focused2.json
index 100bcdd..d9414df 100644
--- a/android/x15/template-cts-focused2.json
+++ b/android/x15/template-cts-focused2.json
@@ -72,7 +72,7 @@
                         "git-repo": "https://git.linaro.org/qa/test-definitions.git",
                         "testdef": "android/cts-host.yaml",
                         "parameters": {
-                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r6.zip",
+                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r7.zip",
                             "JDK": "openjdk-8-jdk-headless",
                             "JRE": "openjdk-8-jre-headless",
                             "DEPENDENCIES": "wget adb xz-utils python-lxml python-setuptools python-pexpect zip lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libncurses5:i386 libstdc++6:i386",
diff --git a/android/x15/template-cts-media.json b/android/x15/template-cts-media.json
index 8ca59f2..b754fe6 100644
--- a/android/x15/template-cts-media.json
+++ b/android/x15/template-cts-media.json
@@ -72,7 +72,7 @@
                         "git-repo": "https://git.linaro.org/qa/test-definitions.git",
                         "testdef": "android/cts-host.yaml",
                         "parameters": {
-                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r6.zip",
+                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r7.zip",
                             "JDK": "openjdk-8-jdk-headless",
                             "JRE": "openjdk-8-jre-headless",
                             "DEPENDENCIES": "wget adb xz-utils python-lxml python-setuptools python-pexpect zip lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libncurses5:i386 libstdc++6:i386",
diff --git a/android/x15/template-cts-opengl.json b/android/x15/template-cts-opengl.json
index 4ea4957..b9ebe2a 100644
--- a/android/x15/template-cts-opengl.json
+++ b/android/x15/template-cts-opengl.json
@@ -72,7 +72,7 @@
                         "git-repo": "https://git.linaro.org/qa/test-definitions.git",
                         "testdef": "android/cts-host.yaml",
                         "parameters": {
-                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r6.zip",
+                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r7.zip",
                             "JDK": "openjdk-8-jdk-headless",
                             "JRE": "openjdk-8-jre-headless",
                             "DEPENDENCIES": "wget adb xz-utils python-lxml python-setuptools python-pexpect zip lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libncurses5:i386 libstdc++6:i386",
diff --git a/android/x15/template-cts-part1.json b/android/x15/template-cts-part1.json
index b979a63..93dc817 100644
--- a/android/x15/template-cts-part1.json
+++ b/android/x15/template-cts-part1.json
@@ -72,7 +72,7 @@
                         "git-repo": "https://git.linaro.org/qa/test-definitions.git",
                         "testdef": "android/cts-host.yaml",
                         "parameters": {
-                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r6.zip",
+                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r7.zip",
                             "JDK": "openjdk-8-jdk-headless",
                             "JRE": "openjdk-8-jre-headless",
                             "DEPENDENCIES": "wget adb xz-utils python-lxml python-setuptools python-pexpect zip lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libncurses5:i386 libstdc++6:i386",
diff --git a/android/x15/template-cts-part2.json b/android/x15/template-cts-part2.json
index cdd991e..415dd31 100644
--- a/android/x15/template-cts-part2.json
+++ b/android/x15/template-cts-part2.json
@@ -72,7 +72,7 @@
                         "git-repo": "https://git.linaro.org/qa/test-definitions.git",
                         "testdef": "android/cts-host.yaml",
                         "parameters": {
-                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r6.zip",
+                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r7.zip",
                             "JDK": "openjdk-8-jdk-headless",
                             "JRE": "openjdk-8-jre-headless",
                             "DEPENDENCIES": "wget adb xz-utils python-lxml python-setuptools python-pexpect zip lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libncurses5:i386 libstdc++6:i386",
diff --git a/android/x15/template-cts-part3.json b/android/x15/template-cts-part3.json
index 4bd5aa4..b646f93 100644
--- a/android/x15/template-cts-part3.json
+++ b/android/x15/template-cts-part3.json
@@ -72,7 +72,7 @@
                         "git-repo": "https://git.linaro.org/qa/test-definitions.git",
                         "testdef": "android/cts-host.yaml",
                         "parameters": {
-                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r6.zip",
+                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r7.zip",
                             "JDK": "openjdk-8-jdk-headless",
                             "JRE": "openjdk-8-jre-headless",
                             "DEPENDENCIES": "wget adb xz-utils python-lxml python-setuptools python-pexpect zip lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libncurses5:i386 libstdc++6:i386",
diff --git a/android/x15/template-cts-part4.json b/android/x15/template-cts-part4.json
index d29a2f0..e0b793d 100644
--- a/android/x15/template-cts-part4.json
+++ b/android/x15/template-cts-part4.json
@@ -72,7 +72,7 @@
                         "git-repo": "https://git.linaro.org/qa/test-definitions.git",
                         "testdef": "android/cts-host.yaml",
                         "parameters": {
-                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r6.zip",
+                            "CTS_URL": "http://testdata.validation.linaro.org/cts/android-cts-7.1_r7.zip",
                             "JDK": "openjdk-8-jdk-headless",
                             "JRE": "openjdk-8-jre-headless",
                             "DEPENDENCIES": "wget adb xz-utils python-lxml python-setuptools python-pexpect zip lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libncurses5:i386 libstdc++6:i386",