Add num=num to all test suite control files.
The num variable is now inserted automatically by the RPC that creates the
suite job. If num is None it will be set to the default in global_config
described by
CROS.sharding_factor.
Remove deprecated test suite kaen_bvt.
Adjust suite_scheduler.ini to match the removal of num from bvt and PGO_record.
Add Kiev out of band BVT with num:1
TEST=Syntax checking
BUG=chromium-os:33194
Change-Id: I5c1342ee07a8e33ed2aff6249bd7b77e46bb2c4e
Reviewed-on: https://gerrit.chromium.org/gerrit/29884
Tested-by: Scott Zawalski <scottz@chromium.org>
Reviewed-by: Chris Masone <cmasone@chromium.org>
Commit-Ready: Scott Zawalski <scottz@chromium.org>
Reviewed-by: Scott Zawalski <scottz@chromium.org>
diff --git a/suite_scheduler.ini b/suite_scheduler.ini
index 13663b2..6076375 100644
--- a/suite_scheduler.ini
+++ b/suite_scheduler.ini
@@ -121,6 +121,7 @@
suite: perfalerts
branch_specs: >=R21
pool: suites
+num: 3
[SecuritySuite]
run_on: new_build
@@ -199,18 +200,28 @@
suite: bvt
branch_specs: >=R22
pool: snow
+num: 4
[ParrotBVT]
run_on: new_build
suite: bvt
branch_specs: >=R21
pool: parrot
+num: 4
[LinkBVT]
run_on: new_build
suite: bvt
branch_specs: >=R22
pool: link
+num: 4
+
+[KievBVT]
+run_on: new_build
+suite: bvt
+branch_specs: >=R21
+pool: bvt
+num: 1
#[Network_wifi]
# We need to figure out how we can work out the scheduling of this test.
diff --git a/test_suites/control.PGO_record b/test_suites/control.PGO_record
index 6a29103..4f7aed0 100644
--- a/test_suites/control.PGO_record
+++ b/test_suites/control.PGO_record
@@ -34,5 +34,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='PGO_record', job=job, pool=pool,
- check_hosts=check_hosts, add_experimental=True, num=1,
+ check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=False)
diff --git a/test_suites/control.audio b/test_suites/control.audio
index 344e58c..b4740ef 100644
--- a/test_suites/control.audio
+++ b/test_suites/control.audio
@@ -29,5 +29,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='audio', job=job, pool=pool,
- check_hosts=check_hosts, add_experimental=True,
+ check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.browsertests b/test_suites/control.browsertests
index 7230bab..ef08f25 100644
--- a/test_suites/control.browsertests
+++ b/test_suites/control.browsertests
@@ -31,5 +31,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='browsertests', job=job, pool=pool,
- check_hosts=check_hosts, add_experimental=True,
+ check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.bvt b/test_suites/control.bvt
index c7c431b..d373328 100644
--- a/test_suites/control.bvt
+++ b/test_suites/control.bvt
@@ -43,5 +43,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='bvt', job=job, pool=pool,
- check_hosts=check_hosts, add_experimental=True, num=4,
+ check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.dummy b/test_suites/control.dummy
index 4d2ea09..f79a92c 100644
--- a/test_suites/control.dummy
+++ b/test_suites/control.dummy
@@ -21,6 +21,6 @@
from autotest_lib.server.cros import dynamic_suite
dynamic_suite.reimage_and_run(
- build=build, board=board, name='dummy', job=job, pool=pool, num=2,
- check_hosts=check_hosts, add_experimental=True,
+ build=build, board=board, name='dummy', job=job, pool=pool,
+ check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.enterprise b/test_suites/control.enterprise
index b2b032c..face331 100644
--- a/test_suites/control.enterprise
+++ b/test_suites/control.enterprise
@@ -29,5 +29,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='enterprise', job=job, pool=pool,
- check_hosts=check_hosts, add_experimental=True,
+ check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.enterprise_enroll b/test_suites/control.enterprise_enroll
index 097c0e7..bcbe99a 100644
--- a/test_suites/control.enterprise_enroll
+++ b/test_suites/control.enterprise_enroll
@@ -26,5 +26,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='enterprise_enroll', job=job, pool=pool,
- check_hosts=check_hosts, add_experimental=True,
+ check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.faft b/test_suites/control.faft
index eb74aba..0d9023a 100644
--- a/test_suites/control.faft
+++ b/test_suites/control.faft
@@ -35,5 +35,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='faft', job=job,
- pool=pool, check_hosts=check_hosts, add_experimental=True,
+ pool=pool, check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.graphics b/test_suites/control.graphics
index 633fda4..778e185 100644
--- a/test_suites/control.graphics
+++ b/test_suites/control.graphics
@@ -42,5 +42,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='graphics', job=job, pool=pool,
- check_hosts=check_hosts, add_experimental=True,
+ check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.graphicsGLES b/test_suites/control.graphicsGLES
index b8052e8..9e0d568 100644
--- a/test_suites/control.graphicsGLES
+++ b/test_suites/control.graphicsGLES
@@ -37,5 +37,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='graphicsGLES', job=job, pool=pool,
- check_hosts=check_hosts, add_experimental=True,
+ check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.hwqual b/test_suites/control.hwqual
index fbaade5..cc29c41 100644
--- a/test_suites/control.hwqual
+++ b/test_suites/control.hwqual
@@ -26,5 +26,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='hwqual', job=job, pool=pool,
- check_hosts=check_hosts, add_experimental=True,
+ check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.kaen_bvt b/test_suites/control.kaen_bvt
deleted file mode 100644
index 7c9214e..0000000
--- a/test_suites/control.kaen_bvt
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "kaen_bvt"
-PURPOSE = "Test basic, required functionality."
-CRITERIA = "All tests with SUITE=kaen_bvt must pass."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the Build Verification Test suite. It should consist of SHORT tests
-that validate critical functionality -- ability to acquire connectivity, perform
-crash reporting, get updates, and allow a user to log in, among other things.
-This suite sets num to 4 in the reimage_and_run call to make sure we run
-across 4 different machines. This overrides the CROS.sharding_factor option in
-the global_config.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros import dynamic_suite
-
-dynamic_suite.reimage_and_run(
- build=build, board=board, name='kaen_bvt', job=job, pool=pool,
- check_hosts=check_hosts, add_experimental=True, num=4,
- skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.kernel_daily_benchmarks b/test_suites/control.kernel_daily_benchmarks
index 62970bc..ee3fb1f 100644
--- a/test_suites/control.kernel_daily_benchmarks
+++ b/test_suites/control.kernel_daily_benchmarks
@@ -30,5 +30,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='kernel_daily_benchamrks', job=job,
- pool=pool, check_hosts=check_hosts, add_experimental=True,
+ pool=pool, check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.kernel_daily_regression b/test_suites/control.kernel_daily_regression
index 2e1d547..4ebfd5c 100644
--- a/test_suites/control.kernel_daily_regression
+++ b/test_suites/control.kernel_daily_regression
@@ -30,5 +30,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='kernel_daily_regression', job=job,
- pool=pool, check_hosts=check_hosts, add_experimental=True,
+ pool=pool, check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.kernel_per-build_benchmarks b/test_suites/control.kernel_per-build_benchmarks
index c22befb..1f62e77 100644
--- a/test_suites/control.kernel_per-build_benchmarks
+++ b/test_suites/control.kernel_per-build_benchmarks
@@ -33,5 +33,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='kernel_per-build_benchmarks', job=job,
- pool=pool, check_hosts=check_hosts, add_experimental=True,
+ pool=pool, check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.kernel_per-build_regression b/test_suites/control.kernel_per-build_regression
index 2f0a4da..f8eb4dc 100644
--- a/test_suites/control.kernel_per-build_regression
+++ b/test_suites/control.kernel_per-build_regression
@@ -35,5 +35,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='kernel_per-build_regression', job=job,
- pool=pool, check_hosts=check_hosts, add_experimental=True,
+ pool=pool, check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.kernel_weekly_regression b/test_suites/control.kernel_weekly_regression
index 0fb0643..1d2db9c 100644
--- a/test_suites/control.kernel_weekly_regression
+++ b/test_suites/control.kernel_weekly_regression
@@ -31,5 +31,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='kernel_weekly_regression', job=job,
- pool=pool, check_hosts=check_hosts, add_experimental=True,
+ pool=pool, check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.network3g b/test_suites/control.network3g
index d7da085..c4f58c6 100644
--- a/test_suites/control.network3g
+++ b/test_suites/control.network3g
@@ -25,5 +25,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='network3g', job=job, pool=pool,
- check_hosts=check_hosts, add_experimental=True,
+ check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.network3g_gobi b/test_suites/control.network3g_gobi
index f513c1d..135282b 100644
--- a/test_suites/control.network3g_gobi
+++ b/test_suites/control.network3g_gobi
@@ -25,5 +25,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='network3g_gobi', job=job, pool=pool,
- check_hosts=check_hosts, add_experimental=True,
+ check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.network_wifi b/test_suites/control.network_wifi
index 349984f..b3612ac 100644
--- a/test_suites/control.network_wifi
+++ b/test_suites/control.network_wifi
@@ -31,5 +31,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='network_wifi', job=job, pool=pool,
- check_hosts=check_hosts, add_experimental=True,
+ check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.pagecycler b/test_suites/control.pagecycler
index 7a5c5e2..62d909a 100644
--- a/test_suites/control.pagecycler
+++ b/test_suites/control.pagecycler
@@ -29,5 +29,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='pagecycler', job=job, pool=pool,
- check_hosts=check_hosts, add_experimental=True,
+ check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.perfalerts b/test_suites/control.perfalerts
index fc4a615..5453e95 100644
--- a/test_suites/control.perfalerts
+++ b/test_suites/control.perfalerts
@@ -31,5 +31,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='perfalerts', job=job, pool=pool,
- check_hosts=check_hosts, add_experimental=True, num=3,
+ check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.power_build b/test_suites/control.power_build
index 9762c9b..deaa7e9 100644
--- a/test_suites/control.power_build
+++ b/test_suites/control.power_build
@@ -26,5 +26,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='power_build', job=job, pool=pool,
- check_hosts=check_hosts, add_experimental=True,
+ check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.power_daily b/test_suites/control.power_daily
index c3494ee..3c97d10 100644
--- a/test_suites/control.power_daily
+++ b/test_suites/control.power_daily
@@ -26,5 +26,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='power_daily', job=job, pool=pool,
- check_hosts=check_hosts, add_experimental=True,
+ check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.power_requirements b/test_suites/control.power_requirements
index 584d416..8953d86 100644
--- a/test_suites/control.power_requirements
+++ b/test_suites/control.power_requirements
@@ -27,5 +27,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='power_requirements', job=job, pool=pool,
- check_hosts=check_hosts, add_experimental=True,
+ check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.pyauto b/test_suites/control.pyauto
index 124817c..0fcc554 100644
--- a/test_suites/control.pyauto
+++ b/test_suites/control.pyauto
@@ -29,5 +29,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='pyauto', job=job, pool=pool,
- check_hosts=check_hosts, add_experimental=True,
+ check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.pyauto_basic b/test_suites/control.pyauto_basic
index 431fedf..9ab33c6 100644
--- a/test_suites/control.pyauto_basic
+++ b/test_suites/control.pyauto_basic
@@ -29,5 +29,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='pyauto_basic', job=job, pool=pool,
- check_hosts=check_hosts, add_experimental=True,
+ check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.pyauto_endurance b/test_suites/control.pyauto_endurance
index f518059..de02f2e 100644
--- a/test_suites/control.pyauto_endurance
+++ b/test_suites/control.pyauto_endurance
@@ -29,5 +29,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='pyauto_endurance', job=job, pool=pool,
- check_hosts=check_hosts, add_experimental=True,
+ check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.pyauto_perf b/test_suites/control.pyauto_perf
index 7135f13..0b580f7 100644
--- a/test_suites/control.pyauto_perf
+++ b/test_suites/control.pyauto_perf
@@ -29,5 +29,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='pyauto_perf', job=job, pool=pool,
- check_hosts=check_hosts, add_experimental=True,
+ check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.regression b/test_suites/control.regression
index 41fb0b5..3c519dc 100644
--- a/test_suites/control.regression
+++ b/test_suites/control.regression
@@ -30,5 +30,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='regression', job=job, pool=pool,
- check_hosts=check_hosts, add_experimental=True,
+ check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.security b/test_suites/control.security
index b813961..b69f585 100755
--- a/test_suites/control.security
+++ b/test_suites/control.security
@@ -32,5 +32,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='security', job=job, pool=pool,
- check_hosts=check_hosts, add_experimental=True,
+ check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.servo b/test_suites/control.servo
index 615b334..f1b4d09 100644
--- a/test_suites/control.servo
+++ b/test_suites/control.servo
@@ -21,5 +21,5 @@
from autotest_lib.server.cros import dynamic_suite
dynamic_suite.reimage_and_run(
- build=build, board=board, name='servo', job=job, pool=pool,
+ build=build, board=board, name='servo', job=job, pool=pool, num=num,
add_experimental=True, skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.smoke b/test_suites/control.smoke
index afb24eb..1dd66e5 100644
--- a/test_suites/control.smoke
+++ b/test_suites/control.smoke
@@ -30,5 +30,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='smoke', job=job, pool=pool,
- check_hosts=check_hosts, add_experimental=True,
+ check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.sync b/test_suites/control.sync
index f6a1bb3..fdc4ce1 100644
--- a/test_suites/control.sync
+++ b/test_suites/control.sync
@@ -29,5 +29,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='sync', job=job, pool=pool,
- check_hosts=check_hosts, add_experimental=True,
+ check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.wificell b/test_suites/control.wificell
index a17fedc..8f3443a 100644
--- a/test_suites/control.wificell
+++ b/test_suites/control.wificell
@@ -26,5 +26,5 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='wificell', job=job, pool=pool,
- check_hosts=check_hosts, add_experimental=True,
+ check_hosts=check_hosts, add_experimental=True, num=num,
skip_reimage=dynamic_suite.skip_reimage(globals()))