commit 04734973a794e1ee2600f9336979b8a2e1332800
author Dan Rue <dan.rue@linaro.org> Wed Mar 21 07:30:01 2018 +0000
committer Linaro Code Review <review@review.linaro.org> Wed Mar 21 07:30:01 2018 +0000
tree e4381280881770ae3f9db3d3cb431f696ace95d5
parent 7ea41637f9a62139415da94c48c8f42f09e41e7b
parent 7d878dd015827d018ec6489baf67a81c3bf197e7

Merge "hikey-v2: add wifi info for basic ping and glbenchmark25 test"

android/hikey-v2/template-glbenchmark25.yaml

diff --git a/android/hikey-v2/template-glbenchmark25.yaml b/android/hikey-v2/template-glbenchmark25.yaml
index a560032..7daa25f 100644
--- a/android/hikey-v2/template-glbenchmark25.yaml
+++ b/android/hikey-v2/template-glbenchmark25.yaml
@@ -12,6 +12,10 @@
   group:
     - lkft
 
+secrets:
+    AP_SSID: "%%AP_SSID%%"
+    AP_KEY: "%%AP_KEY%%"
+
 metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
@@ -119,6 +123,10 @@
       definitions:
         - repository: https://git.linaro.org/qa/test-definitions.git
           from: git
+          path: automated/android/adb-join-wifi/adb-join-wifi.yaml
+          name: adb-join-wifi
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
           path: automated/android/apk-automation/apk-automation.yaml
           name: glbenchmark25
           params:

android/hikey-v2/template.yaml

diff --git a/android/hikey-v2/template.yaml b/android/hikey-v2/template.yaml
index f7a9a39..012a42e 100644
--- a/android/hikey-v2/template.yaml
+++ b/android/hikey-v2/template.yaml
@@ -12,6 +12,10 @@
   group:
     - lkft
 
+secrets:
+    AP_SSID: "%%AP_SSID%%"
+    AP_KEY: "%%AP_KEY%%"
+
 metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
@@ -127,6 +131,10 @@
           name: busybox
         - repository: https://git.linaro.org/qa/test-definitions.git
           from: git
+          path: automated/android/adb-join-wifi/adb-join-wifi.yaml
+          name: adb-join-wifi
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
           path: automated/android/ping/ping.yaml
           name: ping
         - repository: https://git.linaro.org/qa/test-definitions.git