diff options
| author | Victor Chong <victor.chong@linaro.org> | 2018-12-12 03:48:15 +0000 |
|---|---|---|
| committer | Victor Chong <victor.chong@linaro.org> | 2018-12-18 16:59:35 +0000 |
| commit | e269086741a5103e5f9a270587db3a882d027f1e (patch) | |
| tree | f5b810e0258f138123a0d91ee23ef8d000908329 /android-lcr | |
| parent | e1ba0f39cc6a984275a0ffc379a5ec5adced191f (diff) | |
android-lcr/lava job def/plan swg: combine jobs v2
combine gatekeeper and keymaster test jobs into one to save time
Change-Id: Ifd4cd766a46c95dea671942e4ca3da9c594c38d4
Signed-off-by: Victor Chong <victor.chong@linaro.org>
Diffstat (limited to 'android-lcr')
7 files changed, 7 insertions, 7 deletions
diff --git a/android-lcr/lava-job-definitions/definitions/vts-gatekeeper-keymaster.yaml b/android-lcr/lava-job-definitions/definitions/vts-gatekeeper-keymaster.yaml index 96f494b1b7..217184998c 100644 --- a/android-lcr/lava-job-definitions/definitions/vts-gatekeeper-keymaster.yaml +++ b/android-lcr/lava-job-definitions/definitions/vts-gatekeeper-keymaster.yaml @@ -2,8 +2,10 @@ {% set job_timeout = 300 %} {% block priority %}75{% endblock priority %} -# for some reason only the last specified module is run +# for some reason --module m1 --module m2 doesn't work +# only the last specified module is run # i.e. VtsHalKeymasterV3_0Target in this case -# so this file is currently unused -{% set testcommand = "vts-hal --module VtsHalGatekeeperV1_0Target --module VtsHalKeymasterV3_0Target" %} +# so use --include-filter instead +# re: https://linaro.zendesk.com/agent/tickets/2427 +{% set testcommand = "vts-hal --include-filter VtsHalGatekeeperV1_0Target --include-filter VtsHalKeymasterV3_0Target" %} {% set testname = "vts-hal-gatekeeper-keymaster" %} diff --git a/android-lcr/lava-job-definitions/plan_change_swg_hi6220-hikey/vts-gatekeeper-keymaster.yaml b/android-lcr/lava-job-definitions/plan_change_swg_hi6220-hikey/vts-gatekeeper-keymaster.yaml new file mode 120000 index 0000000000..06272b396f --- /dev/null +++ b/android-lcr/lava-job-definitions/plan_change_swg_hi6220-hikey/vts-gatekeeper-keymaster.yaml @@ -0,0 +1 @@ +../definitions/vts-gatekeeper-keymaster.yaml
\ No newline at end of file diff --git a/android-lcr/lava-job-definitions/plan_change_swg_hi6220-hikey/vts-gatekeeper.yaml b/android-lcr/lava-job-definitions/plan_change_swg_hi6220-hikey/vts-gatekeeper.yaml deleted file mode 120000 index 2f1fef889a..0000000000 --- a/android-lcr/lava-job-definitions/plan_change_swg_hi6220-hikey/vts-gatekeeper.yaml +++ /dev/null @@ -1 +0,0 @@ -../definitions/vts-gatekeeper.yaml
\ No newline at end of file diff --git a/android-lcr/lava-job-definitions/plan_change_swg_hi6220-hikey/vts-keymaster.yaml b/android-lcr/lava-job-definitions/plan_change_swg_hi6220-hikey/vts-keymaster.yaml deleted file mode 120000 index 237bf709c3..0000000000 --- a/android-lcr/lava-job-definitions/plan_change_swg_hi6220-hikey/vts-keymaster.yaml +++ /dev/null @@ -1 +0,0 @@ -../definitions/vts-keymaster.yaml
\ No newline at end of file diff --git a/android-lcr/lava-job-definitions/plan_weekly_swg_hi6220-hikey/vts-gatekeeper-keymaster.yaml b/android-lcr/lava-job-definitions/plan_weekly_swg_hi6220-hikey/vts-gatekeeper-keymaster.yaml new file mode 120000 index 0000000000..06272b396f --- /dev/null +++ b/android-lcr/lava-job-definitions/plan_weekly_swg_hi6220-hikey/vts-gatekeeper-keymaster.yaml @@ -0,0 +1 @@ +../definitions/vts-gatekeeper-keymaster.yaml
\ No newline at end of file diff --git a/android-lcr/lava-job-definitions/plan_weekly_swg_hi6220-hikey/vts-gatekeeper.yaml b/android-lcr/lava-job-definitions/plan_weekly_swg_hi6220-hikey/vts-gatekeeper.yaml deleted file mode 120000 index 2f1fef889a..0000000000 --- a/android-lcr/lava-job-definitions/plan_weekly_swg_hi6220-hikey/vts-gatekeeper.yaml +++ /dev/null @@ -1 +0,0 @@ -../definitions/vts-gatekeeper.yaml
\ No newline at end of file diff --git a/android-lcr/lava-job-definitions/plan_weekly_swg_hi6220-hikey/vts-keymaster.yaml b/android-lcr/lava-job-definitions/plan_weekly_swg_hi6220-hikey/vts-keymaster.yaml deleted file mode 120000 index 237bf709c3..0000000000 --- a/android-lcr/lava-job-definitions/plan_weekly_swg_hi6220-hikey/vts-keymaster.yaml +++ /dev/null @@ -1 +0,0 @@ -../definitions/vts-keymaster.yaml
\ No newline at end of file |