commit f3425086682e43fd4b392d0283fb407829840785
author Manoj Gupta <manojgupta@google.com> Sun Aug 09 10:46:02 2020 -0700
committer Commit Bot <commit-bot@chromium.org> Sun Aug 09 20:52:05 2020 +0000
tree 68940eae5c330b70089dd361fadebb41c4e49bb7
parent 4d75bbafd7dd8a397aa7c82a3b70539abf2952a4

chromeos_config: Only keep base/test images for sanitizers

Only keep base/test images for sanitizers as we don't need
factory or recovery images.
This avoids any errors in generating recovery images etc.

BUG=chromium:1114505
TEST=amd64-generic-asan builds

Change-Id: I3653b81fc11c388ed91d70f614b0f6c8498ab651
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2345380
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Manoj Gupta <manojgupta@chromium.org>
Tested-by: Manoj Gupta <manojgupta@chromium.org>

config/chromeos_config.py

diff --git a/config/chromeos_config.py b/config/chromeos_config.py
index a44e94a..d2873a7 100644
--- a/config/chromeos_config.py
+++ b/config/chromeos_config.py
@@ -371,6 +371,7 @@
       # Chrome binary, that update_engine can't handle in delta payloads due to
       # memory limits. Remove the following lines once crbug.com/329248 is
       # fixed.
+      images=['base', 'test'],
       chrome_sdk=False,
       vm_tests=[config_lib.VMTestConfig(constants.VM_SUITE_TEST_TYPE,
                                         test_suite='smoke')],
@@ -384,6 +385,7 @@
       profile='ubsan',
       # Need larger rootfs for ubsan builds.
       disk_layout='16gb-rootfs',
+      images=['base', 'test'],
       chrome_sdk=False,
       vm_tests=[config_lib.VMTestConfig(constants.VM_SUITE_TEST_TYPE,
                                         test_suite='smoke')],

config/config_dump.json

diff --git a/config/config_dump.json b/config/config_dump.json
index 8d5f99d..77b05c7 100644
--- a/config/config_dump.json
+++ b/config/config_dump.json
@@ -155,9 +155,7 @@
             "image_test": true,
             "images": [
                 "base",
-                "recovery",
-                "test",
-                "factory_install"
+                "test"
             ],
             "luci_builder": "CommitQueue",
             "profile": "asan",
@@ -841,6 +839,10 @@
                 "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"enable_skylab\": true,\n    \"file_bugs\": false,\n    \"max_retries\": 5,\n    \"minimum_duts\": 0,\n    \"offload_failures_only\": false,\n    \"pool\": \"quota\",\n    \"priority\": \"PostBuild\",\n    \"quota_account\": \"legacypool-suites\",\n    \"retry\": true,\n    \"suite\": \"bvt-cq\",\n    \"suite_args\": null,\n    \"suite_min_duts\": 1,\n    \"timeout\": 15000,\n    \"warn_only\": false\n}",
                 "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"enable_skylab\": true,\n    \"file_bugs\": false,\n    \"max_retries\": 5,\n    \"minimum_duts\": 0,\n    \"offload_failures_only\": false,\n    \"pool\": \"quota\",\n    \"priority\": \"PostBuild\",\n    \"quota_account\": \"legacypool-suites\",\n    \"retry\": true,\n    \"suite\": \"bvt-perbuild\",\n    \"suite_args\": null,\n    \"suite_min_duts\": 1,\n    \"timeout\": 15000,\n    \"warn_only\": false\n}"
             ],
+            "images": [
+                "base",
+                "test"
+            ],
             "profile": "ubsan",
             "vm_tests": [
                 "{\n    \"max_retries\": 5,\n    \"retry\": false,\n    \"test_suite\": \"smoke\",\n    \"test_type\": \"vm_suite\",\n    \"timeout\": 5400,\n    \"use_ctest\": true,\n    \"warn_only\": false\n}"