Merge "Fix verifyLocationSettings test for API 24."
diff --git a/build/masters/master.client.adt/builders.pyl b/build/masters/master.client.adt/builders.pyl
index 65fb0ac..a122245 100644
--- a/build/masters/master.client.adt/builders.pyl
+++ b/build/masters/master.client.adt/builders.pyl
@@ -94,14 +94,18 @@
"branch": "all",
"name_identifier": "system-images",
},
- "sys_image_nyc_release_poller": {
+ "sys_image_nyc_mr1_dev_poller": {
"gs_bucket": "android-build-emu-sysimage",
- "gs_path": ["builds/git_nyc-emu-release-linux-sdk_google_phone_x86-user/"],
- "pollInterval": 977,
+ "gs_path": ["builds/git_nyc-mr1-emu-dev-linux-sdk_google_phone_x86-sdk/",
+ "builds/git_nyc-mr1-emu-dev-linux-sdk_google_atv_x86-sdk/",
+ "builds/git_nyc-mr1-emu-dev-linux-sdk_google_phone_x86_64-sdk/",
+ "builds/git_nyc-mr1-emu-dev-linux-sdk_google_phone_armv7-sdk/",
+ "builds/git_nyc-mr1-emu-dev-linux-sdk_google_phone_arm64-sdk/"],
+ "pollInterval": 577,
"type": "GSMultiPoller",
- "project": "nyc-emu-release",
+ "project": "nyc-mr1-emu-dev",
"branch": "all",
- "name_identifier": "emulator",
+ "name_identifier": "system-images",
},
"sys_image_klp_poller": {
"gs_bucket": "android-build-emu-sysimage",
@@ -176,6 +180,33 @@
"branch": "Mac",
"name_identifier": "sdk-repo-darwin",
},
+ "emulator_2.3_linux_poller": {
+ "gs_bucket": "android-build-emu",
+ "gs_path": ["builds/aosp-emu-2.3-release-linux-sdk_tools_linux/"],
+ "pollInterval": 347,
+ "type": "GSMultiPoller",
+ "project": "emu-2.3-release",
+ "branch": "Ubuntu",
+ "name_identifier": "sdk-repo-linux",
+ },
+ "emulator_2.3_windows_poller": {
+ "gs_bucket": "android-build-emu",
+ "gs_path": ["builds/aosp-emu-2.3-release-linux-sdk_tools_linux/"],
+ "pollInterval": 487,
+ "type": "GSMultiPoller",
+ "project": "emu-2.3-release",
+ "branch": "Win",
+ "name_identifier": "sdk-repo-windows",
+ },
+ "emulator_2.3_mac_poller": {
+ "gs_bucket": "android-build-emu",
+ "gs_path": ["builds/aosp-emu-2.3-release-mac-sdk_tools_mac/"],
+ "pollInterval": 439,
+ "type": "GSMultiPoller",
+ "project": "emu-2.3-release",
+ "branch": "Mac",
+ "name_identifier": "sdk-repo-darwin",
+ },
},
"category": {
@@ -324,7 +355,7 @@
"type": "emu_scheduler",
},
"system_image_scheduler": {
- "project": ["klp-emu-dev", "lmp-mr1-emu-dev", "mnc-emu-dev", "nyc-emu-dev", "lmp-emu-dev", "gb-emu-dev",
+ "project": ["klp-emu-dev", "lmp-mr1-emu-dev", "mnc-emu-dev", "nyc-emu-dev", "nyc-mr1-emu-dev", "lmp-emu-dev", "gb-emu-dev",
"ics-mr1-emu-dev", "jb-emu-dev", "jb-mr1.1-emu-dev", "jb-mr2-emu-dev"],
"type": "emu_scheduler",
},
diff --git a/build/masters/master.client.adt/slave_logs/parser/parse_and_upload.py b/build/masters/master.client.adt/slave_logs/parser/parse_and_upload.py
index 37c05b5..33b28a5 100755
--- a/build/masters/master.client.adt/slave_logs/parser/parse_and_upload.py
+++ b/build/masters/master.client.adt/slave_logs/parser/parse_and_upload.py
@@ -78,7 +78,8 @@
'21':'lmp-emu-dev',
'22':'lmp-mr1-emu-dev',
'23':'mnc-emu-dev',
- '24':'nyc-emu-release',
+ '24':'nyc-emu-dev',
+ '25':'nyc-mr1-emu-dev',
}
def get_branches(builder, file_path, api):
diff --git a/build/masters/master.client.adt/slave_logs/parser/parse_and_upload_v2.py b/build/masters/master.client.adt/slave_logs/parser/parse_and_upload_v2.py
index 0bfce0f..073e98c 100755
--- a/build/masters/master.client.adt/slave_logs/parser/parse_and_upload_v2.py
+++ b/build/masters/master.client.adt/slave_logs/parser/parse_and_upload_v2.py
@@ -52,7 +52,8 @@
'21': 'lmp-emu-dev',
'22': 'lmp-mr1-emu-dev',
'23': 'mnc-emu-dev',
- '24': 'nyc-emu-release',
+ '24': 'nyc-emu-dev',
+ '25': 'nyc-mr1-emu-dev',
}
def _get_branches(builder, file_path, api):
if builder.endswith('_CTS'):
diff --git a/build/scripts/slave/recipes/adt/adt.py b/build/scripts/slave/recipes/adt/adt.py
index f25c41e..6d6357f 100644
--- a/build/scripts/slave/recipes/adt/adt.py
+++ b/build/scripts/slave/recipes/adt/adt.py
@@ -87,6 +87,7 @@
'emu-2.2-release': bootStep('public', '{"ori": "public"}'),
'mnc-emu-dev': bootStep('MNC', '{"ori": "mnc"}'),
'lmp-mr1-emu-dev': bootStep('LMP_MR1', '{"ori": "lmp-mr1"}'),
+ 'nyc-mr1-emu-dev': bootStep('NYC_MR1', '{"ori": "nyc-mr1"}'),
'nyc-emu-dev': bootStep('NYC', '{"ori": "nyc"}'),
'lmp-emu-dev': bootStep('LMP', '{"ori": "lmp"}'),
'klp-emu-dev': bootStep('KLP', '{"ori": "klp"}'),
diff --git a/emu_test/config/boot_cfg.csv b/emu_test/config/boot_cfg.csv
index 2d00bc4..0302da7 100644
--- a/emu_test/config/boot_cfg.csv
+++ b/emu_test/config/boot_cfg.csv
@@ -1,5 +1,17 @@
Device Config,,,,,,,Linux,,,,Windows,,,,,MacOSX,,,
API*,TAG*,ABI*,DEVICE,RAM,GPU,ORI,Ubuntu 12.04 HD Graphics 4000,Ubuntu 14.04 HD 4400,Ubuntu 14.04 Quadro 600,Ubuntu 15.04 Quadro K600,Win 7 32-bit HD 4400,Win 7 64-bit HD 4400,Win 8 64-bit Quadro 600,Win 8.1 64-bit Quadro 600,Win 10 64-bit Quadro 600,Mac 10.10.5 Intel HD 5000,Mac 10.10.5 Iris Pro,Mac 10.8.5 Intel HD 5000,Mac 10.11.1 Iris Pro
+API 25,android-tv,armeabi-v7a,Android TV (1080p),2048,yes,,,,,,,,,,,,,,
+,,x86,Android TV (1080p),2048,yes,nyc-mr1,P,P,P,P,P,P,P,P,P,P,P,P,P
+,,x86,Android TV (1080p),2048,yes,public,P,P,P,P,P,P,P,P,P,P,P,P,P
+,default,armeabi-v7a,Nexus 6P,2048,yes,nyc-mr1,P,P,P,P,P,P,P,P,P,P,P,P,P
+,,arm64-v8a,Nexus 6P,2048,yes,nyc-mr1,P,P,P,P,S,P,P,P,P,P,P,P,P
+,,x86,Nexus 6P,2048,yes,nyc-mr1,P,P,P,P,P,P,P,P,P,P,P,P,P
+,,x86,Nexus 5X,2048,yes,public,P,P,P,P,P,P,P,P,P,P,P,P,P
+,,x86_64,Nexus 6P,2048,yes,nyc-mr1,P,P,P,P,S,P,P,P,P,P,P,P,P
+,,x86_64,Nexus 5X,2048,yes,public,P,P,P,P,S,P,P,P,P,P,P,P,P
+,google_apis,armeabi-v7a,Nexus 5X,2048,yes,public,,,,,,,,,,,,,
+,,x86,Nexus 6P,2048,yes,public,,,,,,,,,,,,,
+,,x86_64,Nexus 5X,2048,yes,public,,,,,,,,,,,,,
API 24,android-tv,armeabi-v7a,Android TV (1080p),2048,yes,,,,,,,,,,,,,,
,,x86,Android TV (1080p),2048,yes,nyc,P,P,P,P,P,P,P,P,P,P,P,P,P
,,x86,Android TV (1080p),2048,yes,public,P,P,P,P,P,P,P,P,P,P,P,P,P
@@ -76,4 +88,4 @@
,google_apis,x86,Nexus 4,2048,no,ics-mr1,P,P,P,P,P,P,P,P,P,P,P,P,P
API 10,default,x86,Nexus 4,2048,no,public,P,P,P,P,,,P,P,P,P,P,P,P
,,x86,Nexus 4,2048,no,gb,P,P,P,P,P,P,P,P,P,P,P,P,P
-,google_apis,x86,Nexus 4,2048,no,gb,P,P,P,P,P,P,P,P,P,P,P,P,P
\ No newline at end of file
+,google_apis,x86,Nexus 4,2048,no,gb,P,P,P,P,P,P,P,P,P,P,P,P,P
diff --git a/emu_test/dashboard/index.html b/emu_test/dashboard/index.html
index 72e3263..9ed0e73 100644
--- a/emu_test/dashboard/index.html
+++ b/emu_test/dashboard/index.html
@@ -128,7 +128,7 @@
"Win_7_64-bit_HD_4400",
"Win_8.1_64-bit_Quadro_600",
"Win_8_64-bit_Quadro_600"];
- var apis = ["24", "23", "22", "21", "20", "19", "18", "17", "16", "15", "10"];
+ var apis = ["25", "24", "23", "22", "21", "20", "19", "18", "17", "16", "15", "10"];
var tags = ["default", "google_apis", "android-wear", "android-tv"];
var abis = ["x86", "x86_64", "armeabi-v7a", "arm64-v8a", "mips", "mips64"];
var gpus = ["mesa", "on", "off"];
diff --git a/emu_test/utils/download_unzip_image.py b/emu_test/utils/download_unzip_image.py
index b99c2d2..770ef9c 100644
--- a/emu_test/utils/download_unzip_image.py
+++ b/emu_test/utils/download_unzip_image.py
@@ -29,6 +29,8 @@
api = '22'
elif 'mnc' in branch_name:
api = '23'
+ elif 'nyc-mr1' in branch_name:
+ api = '25'
elif 'nyc' in branch_name:
api = '24'
elif 'lmp' in branch_name:
