new_variant_fulltest: add depthcharge variant for guybrush
Guybrush supports a per-variant image for depthcharge, so enable
support in the test script and the new variant step list.
BUG=b:198303126
TEST=`testdata/new_variant_fulltest.sh guybrush && echo PASS`
Cq-Depend: chromium:3260768
Change-Id: I0731e3807645c3c96cd5f36eaaaae788fc775790
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/3258494
Tested-by: Paul Fagerburg <pfagerburg@chromium.org>
Reviewed-by: Raul E Rangel <rrangel@chromium.org>
Commit-Queue: Paul Fagerburg <pfagerburg@chromium.org>
diff --git a/contrib/variant/guybrush.py b/contrib/variant/guybrush.py
index 9268476..644166c 100644
--- a/contrib/variant/guybrush.py
+++ b/contrib/variant/guybrush.py
@@ -19,6 +19,7 @@
step_names.FW_BUILD_CONFIG,
step_names.CB_VARIANT,
step_names.CB_CONFIG,
+ step_names.DC_VARIANT,
step_names.CRAS_CONFIG,
step_names.EC_IMAGE,
step_names.EMERGE,
@@ -34,7 +35,8 @@
coreboot_dir = 'third_party/coreboot'
# List of packages to cros_workon
-workon_pkgs = ['coreboot', 'chromeos-ec', 'chromeos-config-bsp-private']
+workon_pkgs = [
+ 'coreboot', 'chromeos-ec', 'chromeos-config-bsp-private', 'depthcharge']
# The emerge command
emerge_cmd = 'emerge-guybrush'
@@ -53,7 +55,7 @@
# List of commits that will be uploaded with `repo upload`
repo_upload_list = [
step_names.CB_CONFIG, step_names.CRAS_CONFIG, step_names.EC_IMAGE,
- step_names.FW_BUILD_CONFIG]
+ step_names.DC_VARIANT, step_names.FW_BUILD_CONFIG]
# List of commits that will be pushed to review.coreboot.org
coreboot_push_list = [step_names.CB_VARIANT]
diff --git a/contrib/variant/testdata/new_variant_fulltest.sh b/contrib/variant/testdata/new_variant_fulltest.sh
index 7b33d32..f30e3c5 100755
--- a/contrib/variant/testdata/new_variant_fulltest.sh
+++ b/contrib/variant/testdata/new_variant_fulltest.sh
@@ -17,7 +17,7 @@
if [[ "$#" -lt 1 ]]; then
echo "Usage: ${SCRIPT} reference_name"
- echo "e.g. ${SCRIPT} hatch | puff | volteer2 | waddledee | waddledoo | lalala | trembyle | dalboz | brya0"
+ echo "e.g. ${SCRIPT} hatch | puff | volteer2 | waddledee | waddledoo | lalala | trembyle | dalboz | brya0 | guybrush"
echo "End-to-end test to create a new variant of a reference board"
echo "Script version ${VERSION}"
exit 1
@@ -141,6 +141,7 @@
NEW=jojo
CONFIG_DIR=/mnt/host/source/src/project/guybrush
OVERLAY_DIR=/mnt/host/source/src/private-overlays/overlay-guybrush-private/chromeos-base/chromeos-config-bsp-private
+ SUPPORTS_DC_VARIANT=1
;;
*)