enable oc-mr1 image test
Change-Id: I534c85b7a53a68edb718b0ebab498a19633fb840
diff --git a/build/masters/master.client.adt/builders.pyl b/build/masters/master.client.adt/builders.pyl
index 6814b2e..843f1ee 100644
--- a/build/masters/master.client.adt/builders.pyl
+++ b/build/masters/master.client.adt/builders.pyl
@@ -123,6 +123,18 @@
"branch": "all",
"name_identifier": "system-images",
},
+ "sys_image_oc_mr1_dev_poller": {
+ "gs_bucket": "android-build-emu-sysimage",
+ "gs_path": ["builds/git_oc-emu-dev-linux-sdk_gphone_x86-sdk_addon/",
+ "builds/git_oc-emu-dev-linux-sdk_google_atv_x86-sdk/",
+ "builds/git_oc-emu-dev-linux-sdk_gphone_x86_64-sdk_addon/",
+ "builds/git_oc-emu-dev-linux-sdk_gphone_x86-user/"],
+ "pollInterval": 577,
+ "type": "GSMultiPoller",
+ "project": "oc-mr1-emu-dev",
+ "branch": "all",
+ "name_identifier": "system-images",
+ },
"sys_image_master_poller": {
"gs_bucket": "android-build-emu-sysimage",
"gs_path": ["builds/git_master-linux-sdk_gphone_x86_64-sdk_addon/",
@@ -430,7 +442,7 @@
"type": "emu_scheduler",
},
"system_image_scheduler": {
- "project": ["master", "klp-emu-dev", "lmp-mr1-emu-dev", "mnc-emu-dev", "oc-emu-dev", "nyc-emu-dev", "nyc-mr1-emu-dev", "lmp-emu-dev", "gb-emu-dev",
+ "project": ["master", "klp-emu-dev", "lmp-mr1-emu-dev", "mnc-emu-dev", "oc-emu-dev", "oc-mr1-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 b66cc87..2f7ee96 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
@@ -81,6 +81,7 @@
'24':'nyc-emu-dev',
'25':'nyc-mr1-emu-dev',
'26':'oc-emu-dev',
+ '27':'oc-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 4ea696f..da4595a 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
@@ -55,6 +55,7 @@
'24': 'nyc-emu-dev',
'25': 'nyc-mr1-emu-dev',
'26': 'oc-emu-dev',
+ '27': 'oc-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 561c4df..f1acf73 100644
--- a/build/scripts/slave/recipes/adt/adt.py
+++ b/build/scripts/slave/recipes/adt/adt.py
@@ -98,6 +98,7 @@
'nyc-mr1-emu-dev': bootStep('NYC_MR1', '{"ori": "nyc-mr1"}'),
'nyc-emu-dev': bootStep('NYC', '{"ori": "nyc"}'),
'oc-emu-dev': bootStep('OC', '{"ori": "oc"}'),
+ 'oc-mr1-emu-dev': bootStep('OC_MR1', '{"ori": "oc-mr1"}'),
'lmp-emu-dev': bootStep('LMP', '{"ori": "lmp"}'),
'klp-emu-dev': bootStep('KLP', '{"ori": "klp"}'),
'gb-emu-dev': bootStep('GB', '{"ori": "gb"}'),
diff --git a/emu_test/config/boot_cfg.csv b/emu_test/config/boot_cfg.csv
index 2d6b8fc..0a4c235 100644
--- a/emu_test/config/boot_cfg.csv
+++ b/emu_test/config/boot_cfg.csv
@@ -2,6 +2,10 @@
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 P,google_apis,x86,Nexus 6P,2048,yes,master,P,P,P,P,P,P,P,P,P,P,P,P,P
API P,google_apis,x86_64,Nexus 6P,2048,yes,master,P,P,P,P,P,P,P,P,P,P,P,P,P
+API 27,android-tv,x86,Android TV (1080p),2048,yes,oc-mr1,P,P,P,P,P,P,P,P,P,P,P,P,P
+API 27,google_apis,x86,Nexus 6P,2048,yes,oc-mr1,P,P,P,P,P,P,P,P,P,P,P,P,P
+API 27,google_apis_playstore,x86,Nexus 6P,2048,yes,oc-mr1,P,P,P,P,P,P,P,P,P,P,P,P,P
+API 27,google_apis,x86_64,Nexus 6P,2048,yes,oc-mr1,P,P,P,P,P,P,P,P,P,P,P,P,P
API 26,android-tv,x86,Android TV (1080p),2048,yes,public,P,P,P,P,P,P,P,P,P,P,P,P,P
,google_apis,x86,Nexus 6P,2048,yes,public,P,P,P,P,P,P,P,P,P,P,P,P,P
,google_apis_playstore,x86,Nexus 6P,2048,yes,public,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 15b54ae..70370ec 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 = ["26", "25", "24", "23", "22", "21", "20", "19", "18", "17", "16", "15", "10"];
+ var apis = ["27", "26", "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/android_cl_scan.py b/emu_test/utils/android_cl_scan.py
index 4e8c3d7..d9d46f0 100644
--- a/emu_test/utils/android_cl_scan.py
+++ b/emu_test/utils/android_cl_scan.py
@@ -108,6 +108,8 @@
return 'git_nyc-emu-dev', 'sdk_google_phone_x86-sdk_addon'
elif 'sys_image_oc_dev_poller' in poller:
return 'git_oc-emu-dev', 'sdk_gphone_x86-sdk_addon'
+ elif 'sys_image_oc_mr1_dev_poller' in poller:
+ return 'git_oc-mr1-emu-dev', 'sdk_gphone_x86-sdk_addon'
elif 'sys_image_nyc_mr1_dev_poller' in poller:
return 'git_nyc-mr1-emu-dev', 'sdk_google_phone_x86-sdk_addon'
elif 'sys_image_klp_poller' in poller:
diff --git a/emu_test/utils/download_unzip_image.py b/emu_test/utils/download_unzip_image.py
index ab6b120..6af7d2b 100644
--- a/emu_test/utils/download_unzip_image.py
+++ b/emu_test/utils/download_unzip_image.py
@@ -39,6 +39,8 @@
api = '25'
elif 'nyc' in branch_name:
api = '24'
+ elif 'oc-mr1' in branch_name:
+ api = '27'
elif 'oc' in branch_name:
api = '26'
elif 'lmp' in branch_name:
