[autotest] Uprev GTS version to 6.0_r2-5069183
TEST=None
BUG=b:68021674
Change-Id: Ia8f7e5aa93acf4f99fb645391f8dd2089da159e9
Reviewed-on: https://chromium-review.googlesource.com/c/1286478
Commit-Queue: Keith Haddow <haddowk@chromium.org>
Tested-by: Keith Haddow <haddowk@chromium.org>
Trybot-Ready: Keith Haddow <haddowk@chromium.org>
Reviewed-by: Rohit Makasana <rohitbm@chromium.org>
Reviewed-by: Ilja H. Friedel <ihf@chromium.org>
diff --git a/server/site_tests/cheets_GTS/cheets_GTS.py b/server/site_tests/cheets_GTS/cheets_GTS.py
index 14a6f95..205376b 100644
--- a/server/site_tests/cheets_GTS/cheets_GTS.py
+++ b/server/site_tests/cheets_GTS/cheets_GTS.py
@@ -23,7 +23,7 @@
# Maximum default time allowed for each individual GTS module.
_GTS_TIMEOUT_SECONDS = 3600
_PARTNER_GTS_BUCKET = 'gs://chromeos-partner-gts/'
-_PARTNER_GTS_LOCATION = _PARTNER_GTS_BUCKET + 'gts-6.0_r1-4868992.zip'
+_PARTNER_GTS_LOCATION = _PARTNER_GTS_BUCKET + 'gts-6.0_r2-5069183.zip'
_PARTNER_GTS_AUTHKEY = _PARTNER_GTS_BUCKET + 'gts-arc.json'
diff --git a/server/site_tests/cheets_GTS/control.GtsAppTestCases b/server/site_tests/cheets_GTS/control.GtsAppTestCases
new file mode 100644
index 0000000..a1353f8
--- /dev/null
+++ b/server/site_tests/cheets_GTS/control.GtsAppTestCases
@@ -0,0 +1,34 @@
+# Copyright 2016 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This file has been automatically generated. Do not edit!
+
+AUTHOR = 'ARC++ Team'
+NAME = 'cheets_GTS.GtsAppTestCases'
+ATTRIBUTES = 'suite:gts'
+DEPENDENCIES = 'arc'
+JOB_RETRIES = 2
+TEST_TYPE = 'server'
+TIME = 'MEDIUM'
+MAX_RESULT_SIZE_KB = 307200
+DOC = 'Run module GtsAppTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+
+def run_GTS(machine):
+ host_list = [hosts.create_host(machine)]
+ job.run_test(
+ 'cheets_GTS',
+ hosts=host_list,
+ iterations=1,
+ max_retry=2,
+ tag='GtsAppTestCases',
+ test_name='cheets_GTS.GtsAppTestCases',
+ run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAppTestCases', '--ignore-business-logic-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--ignore-business-logic-failure', '--retry', '{session_id}'],
+ target_module='GtsAppTestCases',
+ target_plan=None,
+ warn_on_test_retry=False,
+ retry_manual_tests=True,
+ timeout=3600)
+
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsContactsTest b/server/site_tests/cheets_GTS/control.GtsContactsTest
new file mode 100644
index 0000000..e007838
--- /dev/null
+++ b/server/site_tests/cheets_GTS/control.GtsContactsTest
@@ -0,0 +1,34 @@
+# Copyright 2016 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This file has been automatically generated. Do not edit!
+
+AUTHOR = 'ARC++ Team'
+NAME = 'cheets_GTS.GtsContactsTest'
+ATTRIBUTES = 'suite:gts'
+DEPENDENCIES = 'arc'
+JOB_RETRIES = 2
+TEST_TYPE = 'server'
+TIME = 'MEDIUM'
+MAX_RESULT_SIZE_KB = 307200
+DOC = 'Run module GtsContactsTest of the Android Google Test Suite (GTS) in the ARC++ container.'
+
+def run_GTS(machine):
+ host_list = [hosts.create_host(machine)]
+ job.run_test(
+ 'cheets_GTS',
+ hosts=host_list,
+ iterations=1,
+ max_retry=2,
+ tag='GtsContactsTest',
+ test_name='cheets_GTS.GtsContactsTest',
+ run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsContactsTest', '--ignore-business-logic-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--ignore-business-logic-failure', '--retry', '{session_id}'],
+ target_module='GtsContactsTest',
+ target_plan=None,
+ warn_on_test_retry=False,
+ retry_manual_tests=True,
+ timeout=3600)
+
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsPlacementHostTestCases b/server/site_tests/cheets_GTS/control.GtsPlacementHostTestCases
new file mode 100644
index 0000000..aaa1467
--- /dev/null
+++ b/server/site_tests/cheets_GTS/control.GtsPlacementHostTestCases
@@ -0,0 +1,34 @@
+# Copyright 2016 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This file has been automatically generated. Do not edit!
+
+AUTHOR = 'ARC++ Team'
+NAME = 'cheets_GTS.GtsPlacementHostTestCases'
+ATTRIBUTES = 'suite:gts'
+DEPENDENCIES = 'arc'
+JOB_RETRIES = 2
+TEST_TYPE = 'server'
+TIME = 'MEDIUM'
+MAX_RESULT_SIZE_KB = 307200
+DOC = 'Run module GtsPlacementHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+
+def run_GTS(machine):
+ host_list = [hosts.create_host(machine)]
+ job.run_test(
+ 'cheets_GTS',
+ hosts=host_list,
+ iterations=1,
+ max_retry=2,
+ tag='GtsPlacementHostTestCases',
+ test_name='cheets_GTS.GtsPlacementHostTestCases',
+ run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPlacementHostTestCases', '--ignore-business-logic-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--ignore-business-logic-failure', '--retry', '{session_id}'],
+ target_module='GtsPlacementHostTestCases',
+ target_plan=None,
+ warn_on_test_retry=False,
+ retry_manual_tests=True,
+ timeout=3600)
+
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsSmartBatteryDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsSmartBatteryDeviceTestCases
new file mode 100644
index 0000000..74ab9c9
--- /dev/null
+++ b/server/site_tests/cheets_GTS/control.GtsSmartBatteryDeviceTestCases
@@ -0,0 +1,34 @@
+# Copyright 2016 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This file has been automatically generated. Do not edit!
+
+AUTHOR = 'ARC++ Team'
+NAME = 'cheets_GTS.GtsSmartBatteryDeviceTestCases'
+ATTRIBUTES = 'suite:gts'
+DEPENDENCIES = 'arc'
+JOB_RETRIES = 2
+TEST_TYPE = 'server'
+TIME = 'MEDIUM'
+MAX_RESULT_SIZE_KB = 307200
+DOC = 'Run module GtsSmartBatteryDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+
+def run_GTS(machine):
+ host_list = [hosts.create_host(machine)]
+ job.run_test(
+ 'cheets_GTS',
+ hosts=host_list,
+ iterations=1,
+ max_retry=2,
+ tag='GtsSmartBatteryDeviceTestCases',
+ test_name='cheets_GTS.GtsSmartBatteryDeviceTestCases',
+ run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSmartBatteryDeviceTestCases', '--ignore-business-logic-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--ignore-business-logic-failure', '--retry', '{session_id}'],
+ target_module='GtsSmartBatteryDeviceTestCases',
+ target_plan=None,
+ warn_on_test_retry=False,
+ retry_manual_tests=True,
+ timeout=3600)
+
+parallel_simple(run_GTS, machines)