new_variant: remove EC_BUILDALL step
The upload hook for buildall has been removed as of CL:2436379, so
calling `make buildall -j` as part of the new variant process is
unnecessary.
BUG=b:173801263
TEST=run `new_variant_fulltest.sh` for hatch, trembyle, volteer, and
waddledee, and verify that they are successful.
Cq-Depend: chromium:2436379
Change-Id: I204cf2909b599d917c6fd5fe73ea02b0973fb2c9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/2552717
Tested-by: Paul Fagerburg <pfagerburg@chromium.org>
Commit-Queue: Paul Fagerburg <pfagerburg@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
diff --git a/contrib/variant/hatch.py b/contrib/variant/hatch.py
index 5e4ea37..3802701 100644
--- a/contrib/variant/hatch.py
+++ b/contrib/variant/hatch.py
@@ -21,7 +21,6 @@
step_names.GEN_FIT,
step_names.COMMIT_FIT,
step_names.EC_IMAGE,
- step_names.EC_BUILDALL,
step_names.ADD_PUB_YAML,
step_names.ADD_PRIV_YAML,
step_names.BUILD_CONFIG,
diff --git a/contrib/variant/new_variant.py b/contrib/variant/new_variant.py
index a1dbb19..5092164 100755
--- a/contrib/variant/new_variant.py
+++ b/contrib/variant/new_variant.py
@@ -904,9 +904,7 @@
This function calls create_initial_ec_image.sh, which will clone the
reference board to create the variant. The shell script will build the
- EC code for the variant, but the repo upload hook insists that we
- have done a `make buildall` before it will allow an upload, so this
- function does the buildall.
+ EC code for the variant.
Args:
status: variant_status object tracking our board, variant, etc.
@@ -941,22 +939,25 @@
def ec_buildall(status):
- """Do a make buildall -j for the EC, which is required for repo upload
+ """Deprecated function that used to do a make buildall -j for the EC
- The upload hook checks to ensure that the entire EC codebase builds
- without error, so we have to run make buildall -j before uploading.
+ The EC repo upload hook used to require a make buildall -j before
+ uploading. As of crrev.com/c/2436379 this requirement has been removed,
+ so this step is no longer necessary.
+
+ This function still exists so that if someone has a new variant already
+ in progress and they update new_variant.py, it won't break. Eventually,
+ this function will be removed completely.
Args:
status: variant_status object tracking our board, variant, etc.
Returns:
- True if the script and test build succeeded, False if something failed
+ True
"""
- logging.info('Running step ec_buildall')
+ logging.info('Running deprecated step ec_buildall')
del status # unused parameter
- ec = '/mnt/host/source/src/platform/ec'
- logging.debug('ec = "%s"', ec)
- return run_process(['make', 'buildall', '-j'], cwd=ec)
+ return True
def add_variant_to_public_yaml(status):
diff --git a/contrib/variant/trembyle.py b/contrib/variant/trembyle.py
index f2e4f4c..f27d3ad 100644
--- a/contrib/variant/trembyle.py
+++ b/contrib/variant/trembyle.py
@@ -21,7 +21,6 @@
step_names.CB_CONFIG,
step_names.CRAS_CONFIG,
step_names.EC_IMAGE,
- step_names.EC_BUILDALL,
step_names.EMERGE,
step_names.PUSH,
step_names.FIND,
diff --git a/contrib/variant/volteer.py b/contrib/variant/volteer.py
index 5df5d43..4b7d116 100644
--- a/contrib/variant/volteer.py
+++ b/contrib/variant/volteer.py
@@ -23,7 +23,6 @@
step_names.GEN_FIT,
step_names.COMMIT_FIT,
step_names.EC_IMAGE,
- step_names.EC_BUILDALL,
step_names.EMERGE,
step_names.PUSH,
step_names.UPLOAD,
diff --git a/contrib/variant/waddledee.py b/contrib/variant/waddledee.py
index 9ec33bf..9022467 100644
--- a/contrib/variant/waddledee.py
+++ b/contrib/variant/waddledee.py
@@ -23,7 +23,6 @@
step_names.GEN_FIT,
step_names.COMMIT_FIT,
step_names.EC_IMAGE,
- step_names.EC_BUILDALL,
step_names.EMERGE,
step_names.PUSH,
step_names.UPLOAD,
